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

package/dist/app.js

@@ -8,6 +8,71 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// packages/experience-design-system-cli/src/tui/package-root.ts
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+function findPackageRoot(startUrl, packageName) {
+  let dir = dirname(fileURLToPath(startUrl));
+  let found;
+  while (true) {
+    const manifestPath = join(dir, "package.json");
+    if (existsSync(manifestPath)) {
+      const pkg = JSON.parse(readFileSync(manifestPath, "utf8"));
+      if (pkg.name === packageName) found = dir;
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return found ?? dir;
+    dir = parent;
+  }
+}
+var init_package_root = __esm({
+  "packages/experience-design-system-cli/src/tui/package-root.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/upgrade/version.ts
+import { readFileSync as readFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
+import semver from "semver";
+function readPackageVersion() {
+  const root = findPackageRoot(import.meta.url, PACKAGE_NAME);
+  const pkg = JSON.parse(readFileSync2(join2(root, "package.json"), "utf8"));
+  return pkg.version ?? "unknown";
+}
+function parseVersionTag(tag) {
+  const match2 = /^v(\d+\.\d+\.\d+)$/.exec(tag);
+  return match2 ? match2[1] : void 0;
+}
+async function checkForUpgrade() {
+  const current = readPackageVersion();
+  try {
+    const response = await fetch(TAGS_URL);
+    if (!response.ok) return { status: "error" };
+    const tags = await response.json();
+    const versions = tags.map((tag) => tag.name ? parseVersionTag(tag.name) : void 0).filter((v) => v !== void 0);
+    if (versions.length === 0) return { status: "error" };
+    const latest = versions.reduce((best, v) => semver.gt(v, best) ? v : best);
+    if (!semver.valid(current)) return { status: "error" };
+    if (semver.gt(latest, current)) {
+      return { status: "update-available", current, latest };
+    }
+    return { status: "up-to-date", current };
+  } catch {
+    return { status: "error" };
+  }
+}
+var PACKAGE_NAME, TAGS_URL;
+var init_version = __esm({
+  "packages/experience-design-system-cli/src/tui/upgrade/version.ts"() {
+    "use strict";
+    init_package_root();
+    PACKAGE_NAME = "@contentful/experience-design-system-cli";
+    TAGS_URL = "https://api.github.com/repos/contentful/experience-design-system-sdk-public/tags?per_page=10";
+  }
+});
+
 // packages/experience-design-system-backend-pipeline/dist/src/agents/types/agent-name.js
 var AGENT_NAMES;
 var init_agent_name = __esm({
@@ -772,7 +837,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"],
@@ -821,7 +886,7 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve25(result);
+      resolve27(result);
     });
   });
 }
@@ -843,7 +908,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;
@@ -852,7 +917,7 @@ async function checkAgentAuth(agent) {
         return;
       done = true;
       child.kill("SIGTERM");
-      resolve25("unauthenticated");
+      resolve27("unauthenticated");
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
@@ -863,14 +928,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");
       }
     });
   });
@@ -880,9 +945,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({
@@ -2016,6 +2081,253 @@ var init_cache_keys = __esm({
   }
 });
 
+// packages/experience-design-system-types/dist/src/config/index.js
+import { randomBytes as randomBytes4 } from "node:crypto";
+import { mkdir as mkdir6, readFile as readFile18, rename as rename2, writeFile as writeFile6 } from "node:fs/promises";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname13, join as join17 } from "node:path";
+function configRoot2() {
+  return process.env["EDS_HOME"] || join17(homedir3(), ".contentful", "experience-design-system-cli");
+}
+async function readSettings2() {
+  try {
+    return JSON.parse(await readFile18(configFilePath2(), "utf8"));
+  } catch {
+    return {};
+  }
+}
+async function writeSettings2(settings) {
+  const path5 = configFilePath2();
+  await mkdir6(dirname13(path5), { recursive: true });
+  const tmp = `${path5}.${process.pid}.${randomBytes4(4).toString("hex")}.tmp`;
+  await writeFile6(tmp, `${JSON.stringify(settings, null, 2)}
+`, { mode: 384 });
+  await rename2(tmp, path5);
+}
+async function updateSettings2(patch) {
+  await writeSettings2({ ...await readSettings2(), ...patch });
+}
+var configFilePath2;
+var init_config = __esm({
+  "packages/experience-design-system-types/dist/src/config/index.js"() {
+    "use strict";
+    configFilePath2 = () => join17(configRoot2(), "config.json");
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/settings/debug-mode/debug-mode-store.ts
+async function readDebugModeSetting() {
+  const { debugMode } = await readSettings2();
+  return { ...DEFAULT_DEBUG_MODE_SETTING, ...debugMode };
+}
+async function writeDebugModeSetting(setting) {
+  await updateSettings2({ debugMode: setting });
+}
+var DEFAULT_DEBUG_MODE_SETTING;
+var init_debug_mode_store = __esm({
+  "packages/experience-design-system-cli/src/tui/settings/debug-mode/debug-mode-store.ts"() {
+    "use strict";
+    init_config();
+    DEFAULT_DEBUG_MODE_SETTING = {
+      enabled: true
+    };
+  }
+});
+
+// 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 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");
+  return `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
+}
+function datePrefix(now = /* @__PURE__ */ new Date()) {
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${pad(now.getMonth() + 1)}-${pad(now.getDate())}-${now.getFullYear()}`;
+}
+function slugify(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+}
+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 existing = existsSync9(contentfulDir) ? readdirSync4(contentfulDir) : [];
+  const seqPattern = new RegExp(`^${today}-session-(\\d+)$`);
+  const maxSeq = existing.reduce((max, entry) => {
+    const match2 = seqPattern.exec(entry);
+    return match2 ? Math.max(max, Number(match2[1])) : max;
+  }, 0);
+  return `${today}-session-${maxSeq + 1}`;
+}
+function startSession(base, { replace }) {
+  const contentfulDir = join24(base, ".contentful");
+  if (replace || !sessionDir) sessionDir = join24(contentfulDir, nextSessionId(contentfulDir));
+  return sessionDir;
+}
+function currentDebugSessionDir() {
+  return sessionDir && join24(sessionDir, "debug");
+}
+function currentSessionDir() {
+  return sessionDir;
+}
+async function startDebugSessionIn(base, { replace = false } = {}) {
+  try {
+    if (!await isDebugModeEnabled()) return;
+    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;
+  } catch {
+    return true;
+  }
+}
+function redact(value) {
+  const clone = { ...value };
+  if ("cma_token" in clone) {
+    const raw = clone.cma_token;
+    clone.cma_token = typeof raw === "string" && raw.length > 0 ? `[present, ${raw.length} chars]` : "[not set]";
+  }
+  return clone;
+}
+function startDebugRun({
+  flow,
+  step,
+  menuOption,
+  inputs
+}) {
+  const runId = generateRunId();
+  const startedAt = Date.now();
+  const redactedInputs = redact(inputs);
+  isDebugModeEnabled().then((enabled) => {
+    if (!enabled) return;
+    pendingRun = { flow, step, runId, menuOption, inputs: redactedInputs, startedAt };
+  });
+}
+async function finishDebugRun({
+  outputs,
+  status,
+  exitMethod
+}) {
+  const run = pendingRun;
+  if (!run) return;
+  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 = join24(root, ...flowSegments);
+  await mkdir9(dir, { recursive: true });
+  const filename = nextAttemptFilename(dir, run.menuOption);
+  await writeFile8(join24(dir, filename), content, { mode: 384 });
+}
+function nextAttemptFilename(dir, menuOption) {
+  const today = datePrefix();
+  const optionSlug = slugify(menuOption);
+  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);
+    return match2 ? Math.max(max, Number(match2[1])) : max;
+  }, 0);
+  return `${today}-${optionSlug}-attempt-${maxAttempt + 1}.md`;
+}
+function renderMarkdown(run, finish) {
+  const stepMatch = /^(\d+)-(.+)$/.exec(run.step);
+  const stepLabel2 = stepMatch ? `${stepMatch[1]} - ${stepMatch[2]}` : run.step;
+  const flowSlug = run.flow.split("/").join("-");
+  return `# Debug Log
+
+- Run ID: ${run.runId}
+- Flow: ${flowSlug}
+- Step: ${stepLabel2}
+- Menu option: ${run.menuOption}
+- Date: ${(/* @__PURE__ */ new Date()).toISOString()}
+- CLI version: ${readPackageVersion()}
+- Platform: ${process.platform} / Node ${process.version}
+- Duration on screen: ${finish.durationMs}ms
+- Status: ${finish.status}
+- Exit method: ${finish.exitMethod}
+
+## Inputs
+\`\`\`json
+${JSON.stringify(run.inputs, null, 2)}
+\`\`\`
+
+## Outputs
+\`\`\`json
+${JSON.stringify(finish.outputs, null, 2)}
+\`\`\`
+`;
+}
+function handleCrash() {
+  return finishDebugRun({ outputs: {}, status: "error", exitMethod: "crashed" });
+}
+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();
+    void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(([enabled, base]) => {
+      if (!enabled || !base) return void 0;
+      return mkdir9(join24(startSession(base, { replace: false }), "debug"), { recursive: true });
+    });
+    process.once("uncaughtException", (err) => {
+      void handleCrash().finally(() => {
+        throw err;
+      });
+    });
+    process.once("unhandledRejection", (reason) => {
+      void handleCrash().finally(() => {
+        throw reason;
+      });
+    });
+    process.once("SIGINT", () => {
+      void handleCrash().finally(() => {
+        process.exit(130);
+      });
+    });
+  }
+});
+
 // packages/experience-design-system-cli/app.tsx
 import { join as join25 } from "node:path";
 import { useEffect as useEffect26, useState as useState33 } from "react";
@@ -2055,60 +2367,8 @@ function brandBar(width, ramp = BRAND_RAMP) {
 }
 var FOCUS_MARKER = "\u276F";
 
-// packages/experience-design-system-cli/src/tui/upgrade/version.ts
-import { readFileSync as readFileSync2 } from "node:fs";
-import { join as join2 } from "node:path";
-import semver from "semver";
-
-// packages/experience-design-system-cli/src/tui/package-root.ts
-import { existsSync, readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-function findPackageRoot(startUrl, packageName) {
-  let dir = dirname(fileURLToPath(startUrl));
-  let found;
-  while (true) {
-    const manifestPath = join(dir, "package.json");
-    if (existsSync(manifestPath)) {
-      const pkg = JSON.parse(readFileSync(manifestPath, "utf8"));
-      if (pkg.name === packageName) found = dir;
-    }
-    const parent = dirname(dir);
-    if (parent === dir) return found ?? dir;
-    dir = parent;
-  }
-}
-
-// packages/experience-design-system-cli/src/tui/upgrade/version.ts
-var PACKAGE_NAME = "@contentful/experience-design-system-cli";
-var TAGS_URL = "https://api.github.com/repos/contentful/experience-design-system-sdk-public/tags?per_page=10";
-function readPackageVersion() {
-  const root = findPackageRoot(import.meta.url, PACKAGE_NAME);
-  const pkg = JSON.parse(readFileSync2(join2(root, "package.json"), "utf8"));
-  return pkg.version ?? "unknown";
-}
-function parseVersionTag(tag) {
-  const match2 = /^v(\d+\.\d+\.\d+)$/.exec(tag);
-  return match2 ? match2[1] : void 0;
-}
-async function checkForUpgrade() {
-  const current = readPackageVersion();
-  try {
-    const response = await fetch(TAGS_URL);
-    if (!response.ok) return { status: "error" };
-    const tags = await response.json();
-    const versions = tags.map((tag) => tag.name ? parseVersionTag(tag.name) : void 0).filter((v) => v !== void 0);
-    if (versions.length === 0) return { status: "error" };
-    const latest = versions.reduce((best, v) => semver.gt(v, best) ? v : best);
-    if (!semver.valid(current)) return { status: "error" };
-    if (semver.gt(latest, current)) {
-      return { status: "update-available", current, latest };
-    }
-    return { status: "up-to-date", current };
-  } catch {
-    return { status: "error" };
-  }
-}
+// packages/experience-design-system-cli/src/tui/home/home.tsx
+init_version();
 
 // packages/experience-design-system-cli/src/tui/use-terminal-width.ts
 import { useEffect, useState } from "react";
@@ -12307,11 +12567,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")
   };
 }
 
@@ -13564,7 +13824,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));
 }
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js
@@ -13805,7 +14065,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((resolve25) => setTimeout(resolve25, baseDelay + jitter));
+        await new Promise((resolve27) => setTimeout(resolve27, baseDelay + jitter));
       }
     }
     throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -14937,31 +15197,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);
@@ -14972,7 +15222,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);
@@ -14990,7 +15240,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", {
@@ -14999,7 +15249,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";
@@ -15011,7 +15261,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);
@@ -15038,7 +15288,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();
   }
@@ -16095,7 +16345,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)));
     }
   }
 }
@@ -16928,6 +17178,7 @@ function useCredentialsControls(handlers) {
 }
 
 // packages/experience-design-system-cli/src/tui/user-agent.ts
+init_version();
 function cliUserAgent() {
   return buildUserAgent(readPackageVersion());
 }
@@ -17272,11 +17523,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 {
@@ -17427,34 +17701,8 @@ function ExtractionScreen({
   );
 }
 
-// packages/experience-design-system-types/dist/src/config/index.js
-import { randomBytes as randomBytes4 } from "node:crypto";
-import { mkdir as mkdir6, readFile as readFile18, rename as rename2, writeFile as writeFile6 } from "node:fs/promises";
-import { homedir as homedir3 } from "node:os";
-import { dirname as dirname13, join as join17 } from "node:path";
-function configRoot2() {
-  return process.env["EDS_HOME"] || join17(homedir3(), ".contentful", "experience-design-system-cli");
-}
-var configFilePath2 = () => join17(configRoot2(), "config.json");
-var debugSessionsDir2 = () => join17(configRoot2(), "debug", "sessions");
-async function readSettings2() {
-  try {
-    return JSON.parse(await readFile18(configFilePath2(), "utf8"));
-  } catch {
-    return {};
-  }
-}
-async function writeSettings2(settings) {
-  const path5 = configFilePath2();
-  await mkdir6(dirname13(path5), { recursive: true });
-  const tmp = `${path5}.${process.pid}.${randomBytes4(4).toString("hex")}.tmp`;
-  await writeFile6(tmp, `${JSON.stringify(settings, null, 2)}
-`, { mode: 384 });
-  await rename2(tmp, path5);
-}
-async function updateSettings2(patch) {
-  await writeSettings2({ ...await readSettings2(), ...patch });
-}
+// packages/experience-design-system-cli/app.tsx
+init_config();
 
 // packages/experience-design-system-cli/src/tui/import/steps/06-extraction/use-extraction.ts
 import { useEffect as useEffect5, useRef as useRef2, useState as useState8 } from "react";
@@ -17581,7 +17829,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 !== "",
@@ -20716,7 +20964,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 } : {},
@@ -20724,11 +20972,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);
@@ -27365,7 +27608,7 @@ import { useEffect as useEffect20, useRef as useRef12, useSyncExternalStore } fr
 import { appendFileSync, writeFileSync } from "node:fs";
 import { mkdir as mkdir8 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join23 } 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(state2) {
@@ -27736,7 +27979,7 @@ var realSaveDeps = () => ({
   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)
 });
 async function runPrintFiles(input, deps, onPatch) {
@@ -28070,7 +28313,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);
@@ -28119,171 +28362,19 @@ function useFlow(start, options = {}) {
 // packages/experience-design-system-cli/src/tui/help/PageContainer.tsx
 import { useEffect as useEffect21, useState as useState27 } from "react";
 import { Box as Box42, Text as Text44, useInput as useInput9 } from "ink";
-
-// packages/experience-design-system-cli/src/tui/debug-store.ts
-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 } from "node:path";
-
-// packages/experience-design-system-cli/src/tui/settings/debug-mode/debug-mode-store.ts
-var DEFAULT_DEBUG_MODE_SETTING = {
-  enabled: true
-};
-async function readDebugModeSetting() {
-  const { debugMode } = await readSettings2();
-  return { ...DEFAULT_DEBUG_MODE_SETTING, ...debugMode };
-}
-async function writeDebugModeSetting(setting) {
-  await updateSettings2({ debugMode: setting });
-}
-
-// packages/experience-design-system-cli/src/tui/debug-store.ts
-var pendingRun;
-function generateRunId() {
-  const now = /* @__PURE__ */ new Date();
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
-}
-function datePrefix(now = /* @__PURE__ */ new Date()) {
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${pad(now.getMonth() + 1)}-${pad(now.getDate())}-${now.getFullYear()}`;
-}
-function slugify(value) {
-  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-}
-function generateSessionId3() {
-  const today = datePrefix();
-  const root = debugSessionsDir2();
-  const existing = existsSync9(root) ? readdirSync4(root) : [];
-  const seqPattern = new RegExp(`^${today}-session-(\\d+)$`);
-  const maxSeq = existing.reduce((max, entry) => {
-    const match2 = seqPattern.exec(entry);
-    return match2 ? Math.max(max, Number(match2[1])) : max;
-  }, 0);
-  return `${today}-session-${maxSeq + 1}`;
-}
-var SESSION_ID = generateSessionId3();
-function sessionDebugDir() {
-  return join24(debugSessionsDir2(), SESSION_ID);
-}
-function currentDebugSessionDir() {
-  return sessionDebugDir();
-}
-void isDebugModeEnabled().then((enabled) => {
-  if (!enabled) return void 0;
-  return mkdir9(sessionDebugDir(), { recursive: true });
-});
-async function isDebugModeEnabled() {
-  try {
-    return (await readDebugModeSetting()).enabled;
-  } catch {
-    return true;
-  }
-}
-function redact(value) {
-  const clone = { ...value };
-  if ("cma_token" in clone) {
-    const raw = clone.cma_token;
-    clone.cma_token = typeof raw === "string" && raw.length > 0 ? `[present, ${raw.length} chars]` : "[not set]";
-  }
-  return clone;
-}
-function startDebugRun({
-  flow,
-  step,
-  menuOption,
-  inputs
-}) {
-  const runId = generateRunId();
-  const startedAt = Date.now();
-  const redactedInputs = redact(inputs);
-  isDebugModeEnabled().then((enabled) => {
-    if (!enabled) return;
-    pendingRun = { flow, step, runId, menuOption, inputs: redactedInputs, startedAt };
-  });
-}
-async function finishDebugRun({
-  outputs,
-  status,
-  exitMethod
-}) {
-  const run = pendingRun;
-  if (!run) return;
-  pendingRun = void 0;
-  const durationMs = Date.now() - run.startedAt;
-  const content = renderMarkdown(run, { outputs: redact(outputs), status, exitMethod, durationMs });
-  const flowSegments = run.flow.split("/");
-  const dir = join24(sessionDebugDir(), ...flowSegments);
-  await mkdir9(dir, { recursive: true });
-  const filename = nextAttemptFilename(dir, run.menuOption);
-  await writeFile8(join24(dir, filename), content, { mode: 384 });
-}
-function nextAttemptFilename(dir, menuOption) {
-  const today = datePrefix();
-  const optionSlug = slugify(menuOption);
-  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);
-    return match2 ? Math.max(max, Number(match2[1])) : max;
-  }, 0);
-  return `${today}-${optionSlug}-attempt-${maxAttempt + 1}.md`;
-}
-function renderMarkdown(run, finish) {
-  const stepMatch = /^(\d+)-(.+)$/.exec(run.step);
-  const stepLabel2 = stepMatch ? `${stepMatch[1]} - ${stepMatch[2]}` : run.step;
-  const flowSlug = run.flow.split("/").join("-");
-  return `# Debug Log
-
-- Run ID: ${run.runId}
-- Flow: ${flowSlug}
-- Step: ${stepLabel2}
-- Menu option: ${run.menuOption}
-- Date: ${(/* @__PURE__ */ new Date()).toISOString()}
-- CLI version: ${readPackageVersion()}
-- Platform: ${process.platform} / Node ${process.version}
-- Duration on screen: ${finish.durationMs}ms
-- Status: ${finish.status}
-- Exit method: ${finish.exitMethod}
-
-## Inputs
-\`\`\`json
-${JSON.stringify(run.inputs, null, 2)}
-\`\`\`
-
-## Outputs
-\`\`\`json
-${JSON.stringify(finish.outputs, null, 2)}
-\`\`\`
-`;
-}
-function handleCrash() {
-  return finishDebugRun({ outputs: {}, status: "error", exitMethod: "crashed" });
-}
-process.once("uncaughtException", (err) => {
-  void handleCrash().finally(() => {
-    throw err;
-  });
-});
-process.once("unhandledRejection", (reason) => {
-  void handleCrash().finally(() => {
-    throw reason;
-  });
-});
-process.once("SIGINT", () => {
-  void handleCrash().finally(() => {
-    process.exit(130);
-  });
-});
+init_debug_store();
 
 // packages/experience-design-system-cli/src/tui/help/help-info.ts
+init_config();
+init_debug_store();
+init_debug_mode_store();
+init_version();
 async function readHelpInfo() {
   const debugMode = await readDebugModeSetting();
   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() },
@@ -28292,7 +28383,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"
       }
     ]
   };
@@ -28409,6 +28500,7 @@ import { Box as Box44, Text as Text46, useInput as useInput11 } from "ink";
 import TextInput4 from "ink-text-input";
 
 // packages/experience-design-system-cli/src/tui/settings/utils/v1-store.ts
+init_config();
 var readV1Store = readSettings2;
 var writeV1Store = writeSettings2;
 
@@ -28421,7 +28513,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) {
@@ -28437,6 +28530,7 @@ async function writeCredentials(config) {
 }
 
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
+init_debug_store();
 import { Fragment as Fragment17, jsx as jsx55, jsxs as jsxs45 } from "react/jsx-runtime";
 var FIELD_ORDER = [
   "spaceId",
@@ -28444,7 +28538,8 @@ var FIELD_ORDER = [
   "cmaToken",
   "host",
   "defaultComponentDir",
-  "defaultTokenFile"
+  "defaultTokenFile",
+  "contentfulBaseDir"
 ];
 function debugFields(config) {
   return {
@@ -28453,17 +28548,23 @@ 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 = {
   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"
+};
+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);
@@ -28499,6 +28600,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) => {
@@ -28564,10 +28666,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,
           {
@@ -28576,7 +28675,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: [
@@ -28628,6 +28728,7 @@ async function writeAnalyticsSetting(setting) {
 }
 
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx
+init_debug_store();
 import { Fragment as Fragment18, jsx as jsx56, jsxs as jsxs46 } from "react/jsx-runtime";
 function OptInAnalyticsScreen({ onDone }) {
   const [loading, setLoading] = useState30(true);
@@ -28688,6 +28789,8 @@ function OptInAnalyticsScreen({ onDone }) {
 // packages/experience-design-system-cli/src/tui/upgrade/PageContainer.tsx
 import { useEffect as useEffect24, useState as useState31 } from "react";
 import { Box as Box46, Text as Text48, useInput as useInput13 } from "ink";
+init_version();
+init_debug_store();
 import { jsx as jsx57, jsxs as jsxs47 } from "react/jsx-runtime";
 var UPGRADE_COMMANDS = ["git pull", "pnpm install", "pnpm build"];
 function UpgradeScreen({ onDone }) {
@@ -28759,6 +28862,8 @@ function renderBody(upgradeCheck) {
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
 import { useEffect as useEffect25, useState as useState32 } from "react";
 import { Box as Box47, Text as Text49, useInput as useInput14 } from "ink";
+init_debug_mode_store();
+init_debug_store();
 import { jsx as jsx58, jsxs as jsxs48 } from "react/jsx-runtime";
 function DebugModeScreen({ onDone }) {
   const [loading, setLoading] = useState32(true);
@@ -28861,7 +28966,7 @@ function App({ importOptions, inkClear }) {
     const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
     const state2 = await inspectTokens({
       rawTokensPath: tokens,
-      outDir: join25(resolveUserPath(projectPath2), ".contentful"),
+      contentfulDir: join25(resolveUserPath(projectPath2), ".contentful"),
       cache: importOptions.cache
     });
     if (state2.kind === "cached") {
@@ -28882,6 +28987,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
@@ -28890,6 +28996,7 @@ function App({ importOptions, inkClear }) {
       tokenStrategy,
       input: {
         projectPath: resolveUserPath(launch.projectPath ?? ""),
+        outDir,
         filePaths: launch.filePaths ?? [],
         rawTokensPath: launch.tokens ?? "",
         tokenStrategy,