@contentful/experience-design-system-cli 2.37.1-dev-build-cffd984a.0 → 2.37.1-dev-build-36f90a5a.0

package/dist/app.js

@@ -837,7 +837,7 @@ async function runAgent(options) {
     promptLen: prompt.length,
     promptHead: prompt.slice(0, 500)
   });
-  return new Promise((resolve27) => {
+  return new Promise((resolve26) => {
     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)
       });
-      resolve27(result);
+      resolve26(result);
     });
   });
 }
@@ -908,7 +908,7 @@ async function checkAgentAuth(agent) {
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve27) => {
+  return new Promise((resolve26) => {
     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");
-      resolve27("unauthenticated");
+      resolve26("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) {
-        resolve27("unauthenticated");
+        resolve26("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve27(status.loggedIn ? "ok" : "unauthenticated");
+        resolve26(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve27("unauthenticated");
+        resolve26("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((resolve27) => {
+  return new Promise((resolve26) => {
     const child = spawn2(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve27(code === 0));
+    child.on("close", (code) => resolve26(code === 0));
   });
 }
 var init_check_agent_auth = __esm({
@@ -2107,12 +2107,11 @@ async function writeSettings2(settings) {
 async function updateSettings2(patch) {
   await writeSettings2({ ...await readSettings2(), ...patch });
 }
-var configFilePath2, debugSessionsDir2;
+var configFilePath2;
 var init_config = __esm({
   "packages/experience-design-system-types/dist/src/config/index.js"() {
     "use strict";
     configFilePath2 = () => join17(configRoot2(), "config.json");
-    debugSessionsDir2 = () => join17(configRoot2(), "debug", "sessions");
   }
 });
 
@@ -2140,10 +2139,10 @@ var debug_store_exports = {};
 __export(debug_store_exports, {
   currentDebugSessionDir: () => currentDebugSessionDir,
   finishDebugRun: () => finishDebugRun,
-  setDebugOutDir: () => setDebugOutDir,
-  startDebugRun: () => startDebugRun
+  startDebugRun: () => startDebugRun,
+  startDebugSessionIn: () => startDebugSessionIn
 });
-import { cp, mkdir as mkdir8, rename as rename3, rm, writeFile as writeFile7 } from "node:fs/promises";
+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";
 function generateRunId() {
@@ -2158,10 +2157,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 !== "" ? resolve23(dir) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function nextSessionId(contentfulDir) {
   const today = datePrefix();
-  const root = debugSessionsDir2();
-  const existing = existsSync9(root) ? readdirSync3(root) : [];
+  const existing = existsSync9(contentfulDir) ? readdirSync3(contentfulDir) : [];
   const seqPattern = new RegExp(`^${today}-session-(\\d+)$`);
   const maxSeq = existing.reduce((max, entry) => {
     const match2 = seqPattern.exec(entry);
@@ -2169,31 +2175,18 @@ function generateSessionId3() {
   }, 0);
   return `${today}-session-${maxSeq + 1}`;
 }
-function sessionDebugDir() {
-  return join20(projectSessionsRoot ?? debugSessionsDir2(), SESSION_ID);
+function startSession(base) {
+  const contentfulDir = join20(base, ".contentful");
+  sessionDir ??= join20(contentfulDir, nextSessionId(contentfulDir));
+  return sessionDir;
 }
 function currentDebugSessionDir() {
-  return sessionDebugDir();
-}
-async function setDebugOutDir(outDir) {
-  if (!await isDebugModeEnabled()) return;
-  const nextRoot = join20(resolve23(outDir), "debug", "sessions");
-  const from = sessionDebugDir();
-  const to = join20(nextRoot, SESSION_ID);
-  if (from === to) return;
+  return sessionDir && join20(sessionDir, "debug");
+}
+async function startDebugSessionIn(base) {
   try {
-    await mkdir8(nextRoot, { recursive: true });
-    if (existsSync9(from)) {
-      try {
-        await rename3(from, to);
-      } catch {
-        await cp(from, to, { recursive: true });
-        await rm(from, { recursive: true, force: true });
-      }
-    } else {
-      await mkdir8(to, { recursive: true });
-    }
-    projectSessionsRoot = nextRoot;
+    if (!await isDebugModeEnabled()) return;
+    await mkdir8(join20(startSession(resolve23(base)), "debug"), { recursive: true });
   } catch {
   }
 }
@@ -2236,8 +2229,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 = join20(sessionDebugDir(), ...flowSegments);
+  const dir = join20(root, ...flowSegments);
   await mkdir8(dir, { recursive: true });
   const filename = nextAttemptFilename(dir, run.menuOption);
   await writeFile7(join20(dir, filename), content, { mode: 384 });
@@ -2284,17 +2279,16 @@ ${JSON.stringify(finish.outputs, null, 2)}
 function handleCrash() {
   return finishDebugRun({ outputs: {}, status: "error", exitMethod: "crashed" });
 }
-var pendingRun, SESSION_ID, projectSessionsRoot;
+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 mkdir8(sessionDebugDir(), { recursive: true });
+    void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(([enabled, base]) => {
+      if (!enabled || !base) return void 0;
+      return mkdir8(join20(startSession(base), "debug"), { recursive: true });
     });
     process.once("uncaughtException", (err) => {
       void handleCrash().finally(() => {
@@ -2315,7 +2309,7 @@ var init_debug_store = __esm({
 });
 
 // packages/experience-design-system-cli/app.tsx
-import { join as join26 } from "node:path";
+import { join as join25 } from "node:path";
 import { useEffect as useEffect27, useState as useState33 } from "react";
 
 // packages/experience-design-system-cli/src/tui/home/home.tsx
@@ -4378,12 +4372,12 @@ function renameEmptySlots(db, sessionId, componentId, componentName, slotCount)
     return { renames: [], warnings: [] };
   const renames = [];
   const warnings = [];
-  const rename4 = db.prepare(`UPDATE raw_slots SET name = ? WHERE session_id = ? AND component_id = ? AND name = ? AND position = ?`);
+  const rename3 = db.prepare(`UPDATE raw_slots SET name = ? WHERE session_id = ? AND component_id = ? AND name = ? AND position = ?`);
   db.exec("BEGIN");
   try {
     for (const slot of emptySlots) {
       const newName = slotCount === 1 ? "children" : `slot_${slot.position}`;
-      rename4.run(newName, sessionId, componentId, slot.name, slot.position);
+      rename3.run(newName, sessionId, componentId, slot.name, slot.position);
       renames.push({ oldName: slot.name, newName });
       warnings.push(`${componentName}: slot at position ${slot.position} had empty name \u2014 renamed to "${newName}" for classification`);
     }
@@ -12553,11 +12547,11 @@ import { access as access2, mkdir, readFile as readFile7, writeFile } from "node
 // packages/experience-design-system-backend-pipeline/dist/src/persistence/src/review-session/repositories/review-session-paths.js
 import { resolve as resolve15 } from "node:path";
 async function getRefineSessionPaths(sessionId, artifactsRoot) {
-  const sessionDir = resolve15(artifactsRoot, sessionId);
+  const sessionDir2 = resolve15(artifactsRoot, sessionId);
   return {
-    sessionDir,
-    eventsPath: resolve15(sessionDir, "events.jsonl"),
-    statePath: resolve15(sessionDir, "current-review-state.json")
+    sessionDir: sessionDir2,
+    eventsPath: resolve15(sessionDir2, "events.jsonl"),
+    statePath: resolve15(sessionDir2, "current-review-state.json")
   };
 }
 
@@ -13756,7 +13750,7 @@ function errorMessage(error) {
   return error instanceof Error && error.message ? error.message : String(error);
 }
 function defaultSleep(delayMs) {
-  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
+  return new Promise((resolve26) => setTimeout(resolve26, delayMs));
 }
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js
@@ -13997,7 +13991,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((resolve27) => setTimeout(resolve27, baseDelay + jitter));
+        await new Promise((resolve26) => setTimeout(resolve26, baseDelay + jitter));
       }
     }
     throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -16110,7 +16104,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((resolve27) => setTimeout(resolve27, Math.min(250 * attempt, 2e3)));
+      await new Promise((resolve26) => setTimeout(resolve26, Math.min(250 * attempt, 2e3)));
     }
   }
 }
@@ -16527,12 +16521,12 @@ async function runOneGenerateComponent(options, component, index, total) {
   if (renames.length > 0) {
     const renameMap = new Map(renames.map((r) => [r.oldName, r.newName]));
     effectiveSlots = component.slots.map((s) => renameMap.has(s.name) ? { ...s, name: renameMap.get(s.name) } : s);
-    for (const rename4 of renames) {
+    for (const rename3 of renames) {
       onProgress?.({
         kind: "component:slot-renamed",
         componentName: component.name,
-        oldName: rename4.oldName,
-        newName: rename4.newName
+        oldName: rename3.oldName,
+        newName: rename3.newName
       });
     }
   }
@@ -16658,7 +16652,7 @@ async function runWithPool(items, concurrency, worker) {
 init_cache_keys();
 
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js
-function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
+async function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
   const restorations = [];
   const rekeyed = [];
   const componentStatus = db.prepare("SELECT status FROM raw_components WHERE session_id = ? AND component_id = ?");
@@ -16673,6 +16667,7 @@ function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, al
       componentId: component.component_id
     });
     rekeyed.push({ component, cached: resolution.entry });
+    await new Promise((r) => setImmediate(r));
   }
   copyComponentsFromCache(db, restorations, { allowedComponentNames: allowedComponentNames2 });
   storeCaches(db, rekeyed.map(({ component, cached }) => ({
@@ -16706,12 +16701,15 @@ async function checkGenerateComponentsCache(request) {
       ...components.map((component) => component.name),
       ...(existingEntities?.components ?? []).map((component) => component.name)
     ]);
-    const cachedComponents = components.flatMap((component) => {
+    const cachedComponents = [];
+    for (const component of components) {
       const resolution = resolveComponentCache(db, component, promptHash, allowedComponentNames2);
-      return resolution ? [{ component, resolution }] : [];
-    });
+      if (resolution)
+        cachedComponents.push({ component, resolution });
+      await new Promise((r) => setImmediate(r));
+    }
     if (request.restoreCache) {
-      restoreCachedComponents(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
+      await restoreCachedComponents(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
     }
     return {
       sessionId: request.sessionId,
@@ -17437,7 +17435,6 @@ function ExtractionScreen({
 init_config();
 
 // packages/experience-design-system-cli/src/tui/import/steps/06-extraction/use-extraction.ts
-import { join as join21, resolve as resolve24 } from "node:path";
 import { useEffect as useEffect5, useRef as useRef2, useState as useState8 } from "react";
 
 // packages/experience-design-system-cli/src/tui/import/steps/06-extraction/run.ts
@@ -17711,9 +17708,7 @@ function useExtraction(input) {
         reuseTokens: input.tokenStrategy === "reuse"
       })
     });
-    void Promise.resolve().then(() => (init_debug_store(), debug_store_exports)).then(
-      (store) => store.setDebugOutDir(join21(resolve24(input.projectPath), ".contentful"))
-    );
+    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) => {
@@ -20600,7 +20595,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 resolve25 } from "node:path";
+import { resolve as resolve24 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/08-generation/map-tokens.ts
 async function prepareMapTokens(input, generatedSessionId) {
@@ -20735,7 +20730,7 @@ async function buildMapTokensOptions(input) {
   if (mapOverride?.kind === "text") prompt.skillContentOverride = mapOverride.value;
   if (mapOverride?.kind === "path") {
     await resolvePromptOverride(mapOverride);
-    prompt.skillPathOverride = resolve25(mapOverride.value);
+    prompt.skillPathOverride = resolve24(mapOverride.value);
   }
   if (input.existingEntitiesPath) {
     const entities = await readExistingContentfulEntitiesFromSession({ path: input.existingEntitiesPath });
@@ -20783,7 +20778,7 @@ function useGeneration(input) {
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/build-flow-start.ts
-import { join as join22 } from "node:path";
+import { join as join21 } from "node:path";
 function buildFlowStart(input) {
   const { extraction, handoff, saved, generatePromptPath } = input;
   const credentials = extraction.credentials ?? {
@@ -20796,7 +20791,7 @@ function buildFlowStart(input) {
     handoff,
     agent: extraction.agent,
     projectPath: extraction.projectPath,
-    outDir: extraction.projectPath ? join22(extraction.projectPath, ".contentful") : "",
+    outDir: extraction.projectPath ? join21(extraction.projectPath, ".contentful") : "",
     rawTokensPath: extraction.rawTokensPath,
     credentials: {
       spaceId: credentials.spaceId,
@@ -26540,10 +26535,10 @@ function DoneStep({
 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 join23 } from "node:path";
+import { dirname as dirname15, basename as basename6, join as join22 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/path-utils.ts
-import { resolve as resolve26 } from "node:path";
+import { resolve as resolve25 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function expandTilde(input) {
   if (input === "~" || input.startsWith("~/") || input.startsWith("~\\")) {
@@ -26557,7 +26552,7 @@ function normalizePath(input) {
     p = p.slice(1, -1);
   }
   p = expandTilde(p);
-  return resolve26(p);
+  return resolve25(p);
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/use-blinking-cursor.ts
@@ -26586,13 +26581,13 @@ function autocomplete(partial) {
   }
   const matches = entries.filter((e) => e.startsWith(base));
   if (matches.length === 0) return null;
-  if (matches.length === 1) return join23(dir, matches[0]);
+  if (matches.length === 1) return join22(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 ? join23(dir, prefix) : null;
+  return prefix.length > base.length ? join22(dir, prefix) : null;
 }
 function PathPrompt({
   defaultPath,
@@ -27353,7 +27348,7 @@ import { useEffect as useEffect21, useRef as useRef13, useSyncExternalStore } fr
 import { appendFileSync, writeFileSync } from "node:fs";
 import { mkdir as mkdir9 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join25 } from "node:path";
+import { join as join24 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/wizard-state-transitions.ts
 function shouldBypassPreview(state) {
@@ -27698,7 +27693,7 @@ 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 join24 } from "node:path";
+import { join as join23 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/run-print-files-helpers.ts
 function nextStateAfterPrint(opts) {
@@ -27724,12 +27719,12 @@ var realSaveDeps = () => ({
   writeFile: (path5, contents) => writeFile8(path5, contents),
   appendRun,
   buildSourceFingerprint,
-  sleep: (ms) => new Promise((resolve27) => setTimeout(resolve27, ms)),
+  sleep: (ms) => new Promise((resolve26) => setTimeout(resolve26, ms)),
   warn: (message) => process.stderr.write(message)
 });
 async function runPrintFiles(input, deps, onPatch) {
   onPatch({ step: "printing" });
-  const componentsPath = join24(input.outDir, "components.json");
+  const componentsPath = join23(input.outDir, "components.json");
   try {
     const db = deps.openDb();
     let components = [];
@@ -27810,7 +27805,7 @@ var EMPTY_PUSH_RESULT = {
 };
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/controller.ts
-var WIZARD_LOG = join25(tmpdir(), "experiences-import-wizard.log");
+var WIZARD_LOG = join24(tmpdir(), "experiences-import-wizard.log");
 function appendWizardLog(entry) {
   appendFileSync(WIZARD_LOG, JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), ...entry }) + "\n");
 }
@@ -28109,8 +28104,7 @@ async function readHelpInfo() {
   return {
     storage: [
       { label: "Config folder", value: configRoot2() },
-      { label: "Settings file", value: configFilePath2() },
-      { label: "Debug logs", value: "<project>/.contentful/debug/sessions, next to components.json" }
+      { label: "Settings file", value: configFilePath2() }
     ],
     troubleshooting: [
       { label: "CLI version", value: readPackageVersion() },
@@ -28119,7 +28113,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 default project directory in Settings, or start an import"
       }
     ]
   };
@@ -28249,7 +28243,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) {
@@ -28273,7 +28268,8 @@ var FIELD_ORDER = [
   "cmaToken",
   "host",
   "defaultComponentDir",
-  "defaultTokenFile"
+  "defaultTokenFile",
+  "contentfulBaseDir"
 ];
 function debugFields(config) {
   return {
@@ -28282,7 +28278,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 ?? ""
   };
 }
 var FIELD_LABELS = {
@@ -28291,7 +28288,8 @@ var FIELD_LABELS = {
   cmaToken: "CMA Token",
   host: "API Host (optional)",
   defaultComponentDir: "Default component directory (optional)",
-  defaultTokenFile: "Default token file (optional)"
+  defaultTokenFile: "Default token file (optional)",
+  contentfulBaseDir: "Default project directory, where .contentful goes (optional)"
 };
 function ConfigurationScreen({ onDone }) {
   const [stage, setStage] = useState29("loading");
@@ -28328,6 +28326,7 @@ function ConfigurationScreen({ onDone }) {
     setNotice(null);
     writeCredentials(config).then(() => {
       setLastSaved(config);
+      if (config.contentfulBaseDir) void startDebugSessionIn(config.contentfulBaseDir);
       setNotice({ kind: "success", text: "Configuration saved" });
       setStage("form");
     }).catch((err) => {
@@ -28695,7 +28694,7 @@ function App({ importOptions, inkClear }) {
     const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
     const state = await inspectTokens({
       rawTokensPath: tokens,
-      outDir: join26(resolveUserPath(projectPath2), ".contentful"),
+      outDir: join25(resolveUserPath(projectPath2), ".contentful"),
       cache: importOptions.cache
     });
     if (state.kind === "cached") {

package/dist/index.js

@@ -2121,7 +2121,7 @@ async function runAgent(options) {
     promptLen: prompt.length,
     promptHead: prompt.slice(0, 500)
   });
-  return new Promise((resolve27) => {
+  return new Promise((resolve26) => {
     const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn3(binary, args, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -2170,7 +2170,7 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve27(result);
+      resolve26(result);
     });
   });
 }
@@ -2192,7 +2192,7 @@ async function checkAgentAuth(agent) {
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve27) => {
+  return new Promise((resolve26) => {
     const child = spawn4(binary, ["auth", "status", "--json"], { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
     let done = false;
@@ -2201,7 +2201,7 @@ async function checkAgentAuth(agent) {
         return;
       done = true;
       child.kill("SIGTERM");
-      resolve27("unauthenticated");
+      resolve26("unauthenticated");
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
@@ -2212,14 +2212,14 @@ async function checkAgentAuth(agent) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve27("unauthenticated");
+        resolve26("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve27(status.loggedIn ? "ok" : "unauthenticated");
+        resolve26(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve27("unauthenticated");
+        resolve26("unauthenticated");
       }
     });
   });
@@ -2229,9 +2229,9 @@ async function binaryIsOnPath(binary) {
     const fs = await import("node:fs/promises");
     return fs.access(binary).then(() => true, () => false);
   }
-  return new Promise((resolve27) => {
+  return new Promise((resolve26) => {
     const child = spawn4(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve27(code === 0));
+    child.on("close", (code) => resolve26(code === 0));
   });
 }
 var init_check_agent_auth = __esm({
@@ -4153,12 +4153,12 @@ function renameEmptySlots(db, sessionId, componentId, componentName, slotCount)
     return { renames: [], warnings: [] };
   const renames = [];
   const warnings = [];
-  const rename5 = db.prepare(`UPDATE raw_slots SET name = ? WHERE session_id = ? AND component_id = ? AND name = ? AND position = ?`);
+  const rename4 = db.prepare(`UPDATE raw_slots SET name = ? WHERE session_id = ? AND component_id = ? AND name = ? AND position = ?`);
   db.exec("BEGIN");
   try {
     for (const slot of emptySlots) {
       const newName = slotCount === 1 ? "children" : `slot_${slot.position}`;
-      rename5.run(newName, sessionId, componentId, slot.name, slot.position);
+      rename4.run(newName, sessionId, componentId, slot.name, slot.position);
       renames.push({ oldName: slot.name, newName });
       warnings.push(`${componentName}: slot at position ${slot.position} had empty name \u2014 renamed to "${newName}" for classification`);
     }
@@ -13144,11 +13144,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 resolve15 } from "node:path";
 async function getRefineSessionPaths(sessionId, artifactsRoot) {
-  const sessionDir = resolve15(artifactsRoot, sessionId);
+  const sessionDir2 = resolve15(artifactsRoot, sessionId);
   return {
-    sessionDir,
-    eventsPath: resolve15(sessionDir, "events.jsonl"),
-    statePath: resolve15(sessionDir, "current-review-state.json")
+    sessionDir: sessionDir2,
+    eventsPath: resolve15(sessionDir2, "events.jsonl"),
+    statePath: resolve15(sessionDir2, "current-review-state.json")
   };
 }
 var init_review_session_paths = __esm({
@@ -14901,7 +14901,7 @@ function errorMessage(error) {
   return error instanceof Error && error.message ? error.message : String(error);
 }
 function defaultSleep(delayMs) {
-  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
+  return new Promise((resolve26) => setTimeout(resolve26, delayMs));
 }
 var MAX_RETRY_AFTER_MS;
 var init_http_utils = __esm({
@@ -15177,7 +15177,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((resolve27) => setTimeout(resolve27, baseDelay + jitter));
+            await new Promise((resolve26) => setTimeout(resolve26, baseDelay + jitter));
           }
         }
         throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -18734,7 +18734,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((resolve27) => setTimeout(resolve27, Math.min(250 * attempt, 2e3)));
+      await new Promise((resolve26) => setTimeout(resolve26, Math.min(250 * attempt, 2e3)));
     }
   }
 }
@@ -19251,12 +19251,12 @@ async function runOneGenerateComponent(options, component, index, total) {
   if (renames.length > 0) {
     const renameMap = new Map(renames.map((r) => [r.oldName, r.newName]));
     effectiveSlots = component.slots.map((s) => renameMap.has(s.name) ? { ...s, name: renameMap.get(s.name) } : s);
-    for (const rename5 of renames) {
+    for (const rename4 of renames) {
       onProgress?.({
         kind: "component:slot-renamed",
         componentName: component.name,
-        oldName: rename5.oldName,
-        newName: rename5.newName
+        oldName: rename4.oldName,
+        newName: rename4.newName
       });
     }
   }
@@ -19402,7 +19402,7 @@ var init_run_with_pool = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js
-function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
+async function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
   const restorations = [];
   const rekeyed = [];
   const componentStatus = db.prepare("SELECT status FROM raw_components WHERE session_id = ? AND component_id = ?");
@@ -19417,6 +19417,7 @@ function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, al
       componentId: component.component_id
     });
     rekeyed.push({ component, cached: resolution.entry });
+    await new Promise((r) => setImmediate(r));
   }
   copyComponentsFromCache(db, restorations, { allowedComponentNames: allowedComponentNames2 });
   storeCaches(db, rekeyed.map(({ component, cached }) => ({
@@ -19457,12 +19458,15 @@ async function checkGenerateComponentsCache(request) {
       ...components.map((component) => component.name),
       ...(existingEntities?.components ?? []).map((component) => component.name)
     ]);
-    const cachedComponents = components.flatMap((component) => {
+    const cachedComponents = [];
+    for (const component of components) {
       const resolution = resolveComponentCache(db, component, promptHash, allowedComponentNames2);
-      return resolution ? [{ component, resolution }] : [];
-    });
+      if (resolution)
+        cachedComponents.push({ component, resolution });
+      await new Promise((r) => setImmediate(r));
+    }
     if (request.restoreCache) {
-      restoreCachedComponents(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
+      await restoreCachedComponents(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
     }
     return {
       sessionId: request.sessionId,
@@ -20516,13 +20520,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 = () => join19(configRoot2(), "config.json");
     runsFilePath2 = () => join19(configRoot2(), "state", "runs.json");
-    debugSessionsDir2 = () => join19(configRoot2(), "debug", "sessions");
     oldConfigDir2 = () => join19(homedir3(), ".config", "experiences");
   }
 });
@@ -20825,10 +20828,10 @@ var debug_store_exports = {};
 __export(debug_store_exports, {
   currentDebugSessionDir: () => currentDebugSessionDir,
   finishDebugRun: () => finishDebugRun,
-  setDebugOutDir: () => setDebugOutDir,
-  startDebugRun: () => startDebugRun
+  startDebugRun: () => startDebugRun,
+  startDebugSessionIn: () => startDebugSessionIn
 });
-import { cp, mkdir as mkdir8, rename as rename3, rm, writeFile as writeFile7 } from "node:fs/promises";
+import { mkdir as mkdir8, writeFile as writeFile7 } from "node:fs/promises";
 import { existsSync as existsSync11, readdirSync as readdirSync3 } from "node:fs";
 import { join as join22, resolve as resolve23 } from "node:path";
 function generateRunId() {
@@ -20843,10 +20846,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 !== "" ? resolve23(dir) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function nextSessionId(contentfulDir) {
   const today = datePrefix();
-  const root = debugSessionsDir2();
-  const existing = existsSync11(root) ? readdirSync3(root) : [];
+  const existing = existsSync11(contentfulDir) ? readdirSync3(contentfulDir) : [];
   const seqPattern = new RegExp(`^${today}-session-(\\d+)$`);
   const maxSeq = existing.reduce((max, entry) => {
     const match2 = seqPattern.exec(entry);
@@ -20854,31 +20864,18 @@ function generateSessionId3() {
   }, 0);
   return `${today}-session-${maxSeq + 1}`;
 }
-function sessionDebugDir() {
-  return join22(projectSessionsRoot ?? debugSessionsDir2(), SESSION_ID);
+function startSession(base) {
+  const contentfulDir = join22(base, ".contentful");
+  sessionDir ??= join22(contentfulDir, nextSessionId(contentfulDir));
+  return sessionDir;
 }
 function currentDebugSessionDir() {
-  return sessionDebugDir();
-}
-async function setDebugOutDir(outDir) {
-  if (!await isDebugModeEnabled()) return;
-  const nextRoot = join22(resolve23(outDir), "debug", "sessions");
-  const from = sessionDebugDir();
-  const to = join22(nextRoot, SESSION_ID);
-  if (from === to) return;
+  return sessionDir && join22(sessionDir, "debug");
+}
+async function startDebugSessionIn(base) {
   try {
-    await mkdir8(nextRoot, { recursive: true });
-    if (existsSync11(from)) {
-      try {
-        await rename3(from, to);
-      } catch {
-        await cp(from, to, { recursive: true });
-        await rm(from, { recursive: true, force: true });
-      }
-    } else {
-      await mkdir8(to, { recursive: true });
-    }
-    projectSessionsRoot = nextRoot;
+    if (!await isDebugModeEnabled()) return;
+    await mkdir8(join22(startSession(resolve23(base)), "debug"), { recursive: true });
   } catch {
   }
 }
@@ -20921,8 +20918,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 = join22(sessionDebugDir(), ...flowSegments);
+  const dir = join22(root, ...flowSegments);
   await mkdir8(dir, { recursive: true });
   const filename = nextAttemptFilename(dir, run.menuOption);
   await writeFile7(join22(dir, filename), content, { mode: 384 });
@@ -20969,17 +20968,16 @@ ${JSON.stringify(finish.outputs, null, 2)}
 function handleCrash() {
   return finishDebugRun({ outputs: {}, status: "error", exitMethod: "crashed" });
 }
-var pendingRun, SESSION_ID, projectSessionsRoot;
+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 mkdir8(sessionDebugDir(), { recursive: true });
+    void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(([enabled, base]) => {
+      if (!enabled || !base) return void 0;
+      return mkdir8(join22(startSession(base), "debug"), { recursive: true });
     });
     process.once("uncaughtException", (err) => {
       void handleCrash().finally(() => {
@@ -21000,7 +20998,6 @@ var init_debug_store = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/06-extraction/use-extraction.ts
-import { join as join23, resolve as resolve24 } from "node:path";
 import { useEffect as useEffect5, useRef as useRef2, useState as useState8 } from "react";
 function useExtraction(input) {
   const [state, setState] = useState8();
@@ -21019,9 +21016,7 @@ function useExtraction(input) {
         reuseTokens: input.tokenStrategy === "reuse"
       })
     });
-    void Promise.resolve().then(() => (init_debug_store(), debug_store_exports)).then(
-      (store) => store.setDebugOutDir(join23(resolve24(input.projectPath), ".contentful"))
-    );
+    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) => {
@@ -24243,7 +24238,7 @@ var init_save_decisions = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/08-generation/run.ts
-import { resolve as resolve25 } from "node:path";
+import { resolve as resolve24 } from "node:path";
 async function runGeneration(input, onProgress, deps = realDeps3) {
   let progress = { components: null, mapTokens: "idle", mapTokensEligible: null };
   const update = (change) => {
@@ -24329,7 +24324,7 @@ async function buildMapTokensOptions(input) {
   if (mapOverride?.kind === "text") prompt.skillContentOverride = mapOverride.value;
   if (mapOverride?.kind === "path") {
     await resolvePromptOverride(mapOverride);
-    prompt.skillPathOverride = resolve25(mapOverride.value);
+    prompt.skillPathOverride = resolve24(mapOverride.value);
   }
   if (input.existingEntitiesPath) {
     const entities = await readExistingContentfulEntitiesFromSession({ path: input.existingEntitiesPath });
@@ -24407,7 +24402,7 @@ var init_use_generation = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/build-flow-start.ts
-import { join as join24 } from "node:path";
+import { join as join23 } from "node:path";
 function buildFlowStart(input) {
   const { extraction, handoff, saved, generatePromptPath } = input;
   const credentials = extraction.credentials ?? {
@@ -24420,7 +24415,7 @@ function buildFlowStart(input) {
     handoff,
     agent: extraction.agent,
     projectPath: extraction.projectPath,
-    outDir: extraction.projectPath ? join24(extraction.projectPath, ".contentful") : "",
+    outDir: extraction.projectPath ? join23(extraction.projectPath, ".contentful") : "",
     rawTokensPath: extraction.rawTokensPath,
     credentials: {
       spaceId: credentials.spaceId,
@@ -30616,7 +30611,7 @@ var init_DoneStep = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/path-utils.ts
-import { resolve as resolve26 } from "node:path";
+import { resolve as resolve25 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function expandTilde(input) {
   if (input === "~" || input.startsWith("~/") || input.startsWith("~\\")) {
@@ -30630,7 +30625,7 @@ function normalizePath(input) {
     p = p.slice(1, -1);
   }
   p = expandTilde(p);
-  return resolve26(p);
+  return resolve25(p);
 }
 var init_path_utils = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/path-utils.ts"() {
@@ -30658,7 +30653,7 @@ var init_use_blinking_cursor = __esm({
 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 join25 } from "node:path";
+import { dirname as dirname15, basename as basename6, join as join24 } from "node:path";
 import { jsx as jsx47, jsxs as jsxs38 } from "react/jsx-runtime";
 function autocomplete(partial) {
   if (!partial) return null;
@@ -30673,13 +30668,13 @@ function autocomplete(partial) {
   }
   const matches = entries.filter((e) => e.startsWith(base));
   if (matches.length === 0) return null;
-  if (matches.length === 1) return join25(dir, matches[0]);
+  if (matches.length === 1) return join24(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 ? join25(dir, prefix) : null;
+  return prefix.length > base.length ? join24(dir, prefix) : null;
 }
 function PathPrompt({
   defaultPath,
@@ -31883,7 +31878,7 @@ var init_run_print_files_helpers = __esm({
 
 // 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 join26 } from "node:path";
+import { join as join25 } from "node:path";
 function buildSavedCDF(components, tokens, opts = {}) {
   const cdf = buildCDF2(components, toCdfTokens(tokens), opts);
   if (!cdf) throw new Error("nothing to save \u2014 no components or tokens resolved");
@@ -31895,7 +31890,7 @@ function buildSavedCDF(components, tokens, opts = {}) {
 }
 async function runPrintFiles(input, deps, onPatch) {
   onPatch({ step: "printing" });
-  const componentsPath = join26(input.outDir, "components.json");
+  const componentsPath = join25(input.outDir, "components.json");
   try {
     const db = deps.openDb();
     let components = [];
@@ -31982,7 +31977,7 @@ var init_save = __esm({
       writeFile: (path5, contents) => writeFile8(path5, contents),
       appendRun,
       buildSourceFingerprint,
-      sleep: (ms) => new Promise((resolve27) => setTimeout(resolve27, ms)),
+      sleep: (ms) => new Promise((resolve26) => setTimeout(resolve26, ms)),
       warn: (message) => process.stderr.write(message)
     });
   }
@@ -32004,7 +31999,7 @@ var init_types9 = __esm({
 import { appendFileSync, writeFileSync } from "node:fs";
 import { mkdir as mkdir9 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join27 } from "node:path";
+import { join as join26 } from "node:path";
 function appendWizardLog(entry) {
   appendFileSync(WIZARD_LOG, JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), ...entry }) + "\n");
 }
@@ -32278,7 +32273,7 @@ var init_controller = __esm({
     init_push();
     init_save();
     init_types9();
-    WIZARD_LOG = join27(tmpdir(), "experiences-import-wizard.log");
+    WIZARD_LOG = join26(tmpdir(), "experiences-import-wizard.log");
   }
 });
 
@@ -32316,8 +32311,7 @@ async function readHelpInfo() {
   return {
     storage: [
       { label: "Config folder", value: configRoot2() },
-      { label: "Settings file", value: configFilePath2() },
-      { label: "Debug logs", value: "<project>/.contentful/debug/sessions, next to components.json" }
+      { label: "Settings file", value: configFilePath2() }
     ],
     troubleshooting: [
       { label: "CLI version", value: readPackageVersion() },
@@ -32326,7 +32320,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 default project directory in Settings, or start an import"
       }
     ]
   };
@@ -32483,7 +32477,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) {
@@ -32516,7 +32511,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 }) {
@@ -32554,6 +32550,7 @@ function ConfigurationScreen({ onDone }) {
     setNotice(null);
     writeCredentials(config).then(() => {
       setLastSaved(config);
+      if (config.contentfulBaseDir) void startDebugSessionIn(config.contentfulBaseDir);
       setNotice({ kind: "success", text: "Configuration saved" });
       setStage("form");
     }).catch((err) => {
@@ -32676,7 +32673,8 @@ var init_ContentfulConfigScreen = __esm({
       "cmaToken",
       "host",
       "defaultComponentDir",
-      "defaultTokenFile"
+      "defaultTokenFile",
+      "contentfulBaseDir"
     ];
     FIELD_LABELS = {
       spaceId: "Space ID",
@@ -32684,7 +32682,8 @@ var init_ContentfulConfigScreen = __esm({
       cmaToken: "CMA Token",
       host: "API Host (optional)",
       defaultComponentDir: "Default component directory (optional)",
-      defaultTokenFile: "Default token file (optional)"
+      defaultTokenFile: "Default token file (optional)",
+      contentfulBaseDir: "Default project directory, where .contentful goes (optional)"
     };
   }
 });
@@ -32928,7 +32927,7 @@ var app_exports = {};
 __export(app_exports, {
   runApp: () => runApp
 });
-import { join as join28 } from "node:path";
+import { join as join27 } from "node:path";
 import { useEffect as useEffect27, useState as useState33 } from "react";
 import { Fragment as Fragment19, jsx as jsx59 } from "react/jsx-runtime";
 function App({ importOptions, inkClear }) {
@@ -32979,7 +32978,7 @@ function App({ importOptions, inkClear }) {
     const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
     const state = await inspectTokens({
       rawTokensPath: tokens,
-      outDir: join28(resolveUserPath(projectPath2), ".contentful"),
+      outDir: join27(resolveUserPath(projectPath2), ".contentful"),
       cache: importOptions.cache
     });
     if (state.kind === "cached") {
@@ -33251,7 +33250,7 @@ var init_app = __esm({
 
 // packages/experience-design-system-cli/program.ts
 import { readFileSync as readFileSync9 } from "node:fs";
-import { join as join29 } from "node:path";
+import { join as join28 } from "node:path";
 import { Command } from "commander";
 
 // packages/experience-design-system-cli/src/legacy/run-legacy.ts
@@ -33355,14 +33354,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((resolve27) => {
+  return new Promise((resolve26) => {
     const child = spawn2(process.execPath, [script, ...args], { stdio: "inherit" });
     process.on("SIGINT", () => void 0);
-    child.on("exit", (code) => resolve27(code ?? 0));
+    child.on("exit", (code) => resolve26(code ?? 0));
     child.on("error", (err) => {
       process.stderr.write(`${err.message}
 `);
-      resolve27(1);
+      resolve26(1);
     });
   });
 }
@@ -33387,7 +33386,7 @@ function registerImportCommand(program, openTui) {
 init_package_root();
 var pkg = JSON.parse(
   readFileSync9(
-    join29(findPackageRoot(import.meta.url, "@contentful/experience-design-system-cli"), "package.json"),
+    join28(findPackageRoot(import.meta.url, "@contentful/experience-design-system-cli"), "package.json"),
     "utf8"
   )
 );
@@ -33406,8 +33405,8 @@ function createProgram() {
 init_config();
 init_package_root();
 import { existsSync as existsSync12 } from "node:fs";
-import { mkdir as mkdir10, readFile as readFile19, rename as rename4, rmdir, unlink } from "node:fs/promises";
-import { dirname as dirname16, join as join30 } from "node:path";
+import { mkdir as mkdir10, readFile as readFile19, rename as rename3, rmdir, unlink } from "node:fs/promises";
+import { dirname as dirname16, join as join29 } from "node:path";
 var PACKAGE_NAME4 = "@contentful/experience-design-system-cli";
 async function readJson(path5) {
   try {
@@ -33418,9 +33417,9 @@ async function readJson(path5) {
 }
 async function migrateOldConfig() {
   try {
-    const oldCredentials = join30(oldConfigDir2(), "credentials.json");
-    const oldRuns = join30(oldConfigDir2(), "runs.json");
-    const oldDebugMode = join30(
+    const oldCredentials = join29(oldConfigDir2(), "credentials.json");
+    const oldRuns = join29(oldConfigDir2(), "runs.json");
+    const oldDebugMode = join29(
       findPackageRoot(import.meta.url, PACKAGE_NAME4),
       ".contentful",
       "config",
@@ -33434,7 +33433,7 @@ async function migrateOldConfig() {
     if (existsSync12(oldRuns)) {
       if (!existsSync12(runsFilePath2())) {
         await mkdir10(dirname16(runsFilePath2()), { recursive: true });
-        await rename4(oldRuns, runsFilePath2());
+        await rename3(oldRuns, runsFilePath2());
       } else {
         await unlink(oldRuns);
       }

package/dist/package.json

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

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

@@ -1,12 +1,11 @@
 type Status = 'success' | 'error';
 type ExitMethod = 'saved' | 'discarded' | 'crashed';
-export declare function currentDebugSessionDir(): string;
+export declare function currentDebugSessionDir(): string | undefined;
 /**
- * Moves this session's logs to `<outDir>/debug/sessions/<session>/`, next to the CDF, and writes there from now on.
- * Logs written before the project was known come along. Safe to call repeatedly; a different outDir moves them again.
- * Fail-open like the rest of the logger: if the move fails the logs stay where they were.
+ * Starts this terminal session's folder in `base`, unless a session already started somewhere else. Called when the
+ * user saves the base directory setting and when the import starts without one. Fail-open like the rest of the logger.
  */
-export declare function setDebugOutDir(outDir: string): Promise<void>;
+export declare function startDebugSessionIn(base: string): Promise<void>;
 export declare function startDebugRun({ flow, step, menuOption, inputs, }: {
     flow: string;
     step: string;

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-cffd984a.0",
+  "version": "2.37.1-dev-build-36f90a5a.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-cffd984a.0",
+  "version": "2.37.1-dev-build-36f90a5a.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-cffd984a.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-cffd984a.0"
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-36f90a5a.0",
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-36f90a5a.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",