@contentful/experience-design-system-cli 2.37.1-dev-build-8757f66c.0 → 2.37.1-dev-build-7d013617.0

package/dist/index.js

@@ -57,6 +57,27 @@ var init_legacy_cli_path = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/commands/import-options.ts
+function toImportOptions(raw) {
+  return {
+    ...raw.agent ? { agent: raw.agent } : {},
+    prompt: raw.prompt ?? [],
+    cache: raw.cache !== false
+  };
+}
+function importOptionArgs(options) {
+  return [
+    ...options.agent ? ["--agent", options.agent] : [],
+    ...options.prompt.flatMap((value) => ["--prompt", value]),
+    ...options.cache ? [] : ["--no-cache"]
+  ];
+}
+var init_import_options = __esm({
+  "packages/experience-design-system-cli/src/commands/import-options.ts"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-cli/src/tui/home/home.theme.ts
 function brandBar(width, ramp = BRAND_RAMP) {
   if (width <= 0 || ramp.length === 0) return [];
@@ -2875,15 +2896,15 @@ import { statSync as statSync2 } from "node:fs";
 import path4 from "node:path";
 function collectFiles(root, options = {}) {
   const resolved = path4.resolve(root);
-  let stat;
+  let stat2;
   try {
-    stat = statSync2(resolved);
+    stat2 = statSync2(resolved);
   } catch (err) {
     return { ok: false, failure: classifyStatError(err.code), rootPath: resolved };
   }
-  if (stat.isFile())
+  if (stat2.isFile())
     return { ok: false, failure: "is-file", rootPath: resolved };
-  if (!stat.isDirectory())
+  if (!stat2.isDirectory())
     return { ok: false, failure: "not-directory", rootPath: resolved };
   const result = {
     filePaths: [],
@@ -3202,11 +3223,9 @@ var init_resolve_session_id = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/persistence/src/credentials/helpers/host-utils.js
-var DEFAULT_CONFIGURED_HOST;
 var init_host_utils = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/persistence/src/credentials/helpers/host-utils.js"() {
     "use strict";
-    DEFAULT_CONFIGURED_HOST = "api.contentful.com";
   }
 });
 
@@ -3681,9 +3700,9 @@ var init_utils_gen = __esm({
       config.headers = mergeHeaders(a.headers, b.headers);
       return config;
     };
-    mergeHeaders = (...headers) => {
+    mergeHeaders = (...headers2) => {
       const mergedHeaders = new Headers();
-      for (const header of headers) {
+      for (const header of headers2) {
         if (!header || typeof header !== "object") {
           continue;
         }
@@ -3930,37 +3949,10 @@ var init_client_gen2 = __esm({
 });
 
 // packages/experience-design-system-client/dist/src/generated/sdk.gen.js
-var designSystemImportSourcelessPreview, designSystemImportApply, designSystemImportGetOperation;
 var init_sdk_gen = __esm({
   "packages/experience-design-system-client/dist/src/generated/sdk.gen.js"() {
     "use strict";
     init_client_gen2();
-    designSystemImportSourcelessPreview = (options) => {
-      return (options.client ?? client).post({
-        url: "/spaces/{spaceId}/environments/{environmentId}/design_systems/imports/preview",
-        ...options,
-        headers: {
-          "Content-Type": "application/json",
-          ...options.headers
-        }
-      });
-    };
-    designSystemImportApply = (options) => {
-      return (options.client ?? client).post({
-        url: "/spaces/{spaceId}/environments/{environmentId}/design_systems/imports/apply",
-        ...options,
-        headers: {
-          "Content-Type": "application/json",
-          ...options.headers
-        }
-      });
-    };
-    designSystemImportGetOperation = (options) => {
-      return (options.client ?? client).get({
-        url: "/spaces/{spaceId}/environments/{environmentId}/design_systems/imports/apply/{operationId}",
-        ...options
-      });
-    };
   }
 });
 
@@ -3983,13 +3975,9 @@ var init_src2 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/constants/api.js
-var PREVIEW_ERROR_PREFIX, APPLY_ERROR_PREFIX, USER_AGENT;
 var init_api = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/constants/api.js"() {
     "use strict";
-    PREVIEW_ERROR_PREFIX = "preview failed:";
-    APPLY_ERROR_PREFIX = "apply failed:";
-    USER_AGENT = "experience-design-system-backend-pipeline";
   }
 });
 
@@ -4002,153 +3990,34 @@ var init_constants5 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/http-utils.js
-function isTransientStatus(status) {
-  return status >= 500 && status <= 599;
-}
-function retryAfterMs(response) {
-  const value = response.headers?.get("retry-after")?.trim();
-  if (!value)
-    return void 0;
-  const seconds = Number(value);
-  const delayMs = Number.isFinite(seconds) ? seconds * 1e3 : Date.parse(value) - Date.now();
-  if (!Number.isFinite(delayMs) || delayMs < 0 || delayMs > MAX_RETRY_AFTER_MS)
-    return void 0;
-  return Math.round(delayMs);
-}
-function isApsDenialBody(body) {
-  if (!body)
-    return false;
-  try {
-    const parsed = JSON.parse(body);
-    const id = parsed?.sys?.id;
-    return id === "NotFound" || id === "AccessDenied";
-  } catch {
-    return false;
-  }
-}
-function stringifyError(error) {
-  return typeof error === "string" ? error : JSON.stringify(error ?? {});
-}
-function errorMessage(error) {
-  return error instanceof Error && error.message ? error.message : String(error);
-}
-function defaultSleep(delayMs) {
-  return new Promise((resolve2) => setTimeout(resolve2, delayMs));
-}
-var MAX_RETRY_AFTER_MS;
 var init_http_utils = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/http-utils.js"() {
     "use strict";
-    MAX_RETRY_AFTER_MS = 6e4;
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js
-function sanitizeBreakingChanges(raw) {
-  if (!Array.isArray(raw))
-    return [];
-  const out = [];
-  for (const bc of raw) {
-    if (typeof bc !== "object" || bc === null)
-      continue;
-    const reason = bc.reason;
-    if (typeof reason !== "string")
-      continue;
-    if ("propertyId" in bc && typeof bc.propertyId === "string") {
-      if (PROPERTY_BREAKING_REASONS.has(reason))
-        out.push(bc);
-      continue;
-    }
-    if ("slotId" in bc && typeof bc.slotId === "string") {
-      if (SLOT_BREAKING_REASONS.has(reason))
-        out.push(bc);
-      continue;
-    }
-  }
-  return out;
-}
-function sanitizePreviewResponse(res) {
-  for (const item of res.components?.changed ?? []) {
-    const cc = item.changeClassification;
-    if (cc && Array.isArray(cc.breakingChanges)) {
-      cc.breakingChanges = sanitizeBreakingChanges(cc.breakingChanges);
-    }
-  }
-  return res;
-}
-var PROPERTY_BREAKING_REASONS, SLOT_BREAKING_REASONS;
 var init_sanitize_preview = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js"() {
     "use strict";
-    PROPERTY_BREAKING_REASONS = /* @__PURE__ */ new Set([
-      "removed",
-      "added_required_no_default",
-      "type_changed",
-      "validation_narrowed"
-    ]);
-    SLOT_BREAKING_REASONS = /* @__PURE__ */ new Set(["slot_removed", "slot_allowed_components_narrowed"]);
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/host-utils.js
-function trimTrailingSlashes(value) {
-  return value.replace(/\/+$/, "");
-}
-function normalizeHostInput(host) {
-  const value = host?.trim();
-  if (!value)
-    return void 0;
-  return trimTrailingSlashes(value);
-}
-function toConfiguredHost2(host) {
-  const normalized = normalizeHostInput(host);
-  if (!normalized)
-    return void 0;
-  return normalized.replace(/^https:\/\//i, "");
-}
-function toApiHost2(host) {
-  const normalized = normalizeHostInput(host);
-  if (!normalized)
-    return DEFAULT_API_HOST;
-  if (/^[a-z][a-z\d+\-.]*:\/\//i.test(normalized))
-    return normalized;
-  return `https://${normalized}`;
-}
-var DEFAULT_API_HOST;
 var init_host_utils2 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/host-utils.js"() {
     "use strict";
-    DEFAULT_API_HOST = "https://api.contentful.com";
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/types/api-error.js
-var ERROR_BODY_LOG_CAP, ApiError;
 var init_api_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/types/api-error.js"() {
     "use strict";
-    ERROR_BODY_LOG_CAP = 16384;
-    ApiError = class extends Error {
-      status;
-      body;
-      guidance;
-      constructor(message, status, body, guidance) {
-        super(message);
-        this.status = status;
-        this.body = body;
-        this.guidance = guidance;
-        if (body) {
-          const trimmed = body.length > ERROR_BODY_LOG_CAP ? body.slice(0, ERROR_BODY_LOG_CAP) + "\u2026" : body;
-          this.message = `${message}
-${trimmed}`;
-        }
-      }
-    };
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/api-client/api-client.js
-var ApiClient;
 var init_api_client = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/api-client/api-client.js"() {
     "use strict";
@@ -4158,161 +4027,6 @@ var init_api_client = __esm({
     init_sanitize_preview();
     init_host_utils2();
     init_api_error();
-    ApiClient = class {
-      host;
-      token;
-      spaceId;
-      environmentId;
-      retry;
-      lastRequestId;
-      constructor(opts) {
-        this.host = toApiHost2(opts.host);
-        this.token = opts.cmaToken;
-        this.spaceId = opts.spaceId;
-        this.environmentId = opts.environmentId;
-        const initialDelayMs = Math.max(0, opts.retry?.initialDelayMs ?? 250);
-        this.retry = {
-          maxAttempts: Math.max(1, Math.floor(opts.retry?.maxAttempts ?? 3)),
-          initialDelayMs,
-          maxDelayMs: Math.max(initialDelayMs, opts.retry?.maxDelayMs ?? 2e3),
-          sleep: opts.retry?.sleep ?? defaultSleep
-        };
-      }
-      getLastRequestId() {
-        return this.lastRequestId;
-      }
-      noteRequestId(response) {
-        const id = response.headers.get("x-contentful-request-id");
-        if (id)
-          this.lastRequestId = id;
-      }
-      headers() {
-        return {
-          Authorization: `Bearer ${this.token}`,
-          "Content-Type": "application/json",
-          "X-Contentful-User-Agent": USER_AGENT
-        };
-      }
-      async requestWithRetry(phase, errorPrefix, makeCall) {
-        for (let attempt = 1; attempt <= this.retry.maxAttempts; attempt++) {
-          let result;
-          try {
-            result = await makeCall();
-          } catch (error) {
-            if (attempt === this.retry.maxAttempts) {
-              const body = `The request failed after ${attempt} attempts because of a network error: ${errorMessage(error)}. Check your connection and try again.`;
-              throw new ApiError(`${errorPrefix} 0`, 0, body);
-            }
-            await this.retry.sleep(Math.min(this.retry.initialDelayMs * 2 ** (attempt - 1), this.retry.maxDelayMs));
-            continue;
-          }
-          if (!isTransientStatus(result.response.status)) {
-            this.noteRequestId(result.response);
-            return result;
-          }
-          if (attempt === this.retry.maxAttempts) {
-            const body = stringifyError(result.error);
-            const guidance = `The ${phase} request failed after ${attempt} attempts because the service remained unavailable. Wait a moment and try again.`;
-            throw new ApiError(`${errorPrefix} ${result.response.status}`, result.response.status, body, guidance);
-          }
-          const backoffMs = Math.min(this.retry.initialDelayMs * 2 ** (attempt - 1), this.retry.maxDelayMs);
-          await this.retry.sleep(retryAfterMs(result.response) ?? backoffMs);
-        }
-        throw new Error("Retry attempts exhausted");
-      }
-      async validateToken() {
-        const res = await fetch(`${this.host}/users/me`, { headers: this.headers() });
-        this.noteRequestId(res);
-        if (res.status === 401) {
-          throw new ApiError("CMA token is invalid or revoked", res.status, await res.text());
-        }
-        if (!res.ok) {
-          throw new ApiError(`unexpected error validating token: ${res.status}`, res.status, await res.text());
-        }
-        await this.checkPreflight();
-      }
-      async checkPreflight() {
-        const url = `${this.host}/spaces/${this.spaceId}/environments/${this.environmentId}/design_systems/preflight`;
-        let res;
-        try {
-          res = await fetch(url, { headers: this.headers() });
-        } catch {
-          return;
-        }
-        this.noteRequestId(res);
-        if (res.ok)
-          return;
-        if (res.status >= 500)
-          return;
-        const body = await res.text();
-        if (res.status === 404 && !isApsDenialBody(body))
-          return;
-        throw new ApiError(`preflight failed: ${res.status}`, res.status, body);
-      }
-      async previewImport(cdf) {
-        const result = await this.requestWithRetry("preview", PREVIEW_ERROR_PREFIX, () => designSystemImportSourcelessPreview({
-          baseUrl: this.host,
-          headers: this.headers(),
-          path: { spaceId: this.spaceId, environmentId: this.environmentId },
-          body: cdf,
-          parseAs: "json"
-        }));
-        if (!result.response.ok) {
-          throw new ApiError(`${PREVIEW_ERROR_PREFIX} ${result.response.status}`, result.response.status, stringifyError(result.error));
-        }
-        return sanitizePreviewResponse(result.data);
-      }
-      async applyImport(cdf, opts) {
-        let result;
-        try {
-          result = await designSystemImportApply({
-            baseUrl: this.host,
-            headers: this.headers(),
-            path: { spaceId: this.spaceId, environmentId: this.environmentId },
-            body: { ...cdf, acknowledgeBreakingChanges: opts.acknowledgeBreakingChanges },
-            parseAs: "json"
-          });
-        } catch (error) {
-          const body = `The apply request was not retried because its outcome is unknown and retrying could start a duplicate operation. Cause: ${errorMessage(error)}`;
-          throw new ApiError(`${APPLY_ERROR_PREFIX} 0`, 0, body);
-        }
-        if (!result.response.ok) {
-          const body = stringifyError(result.error);
-          const guidance = isTransientStatus(result.response.status) ? "The apply request was not retried because the server may already have started an operation and retrying could create a duplicate." : void 0;
-          throw new ApiError(`${APPLY_ERROR_PREFIX} ${result.response.status}`, result.response.status, body, guidance);
-        }
-        this.noteRequestId(result.response);
-        return result.data;
-      }
-      async pollOperation(operationId, opts = {}) {
-        const intervalMs = opts.intervalMs ?? 2e3;
-        const maxIntervalMs = opts.maxIntervalMs ?? Math.round(intervalMs * 2.5);
-        const maxAttempts = opts.maxAttempts ?? 150;
-        const terminalStatuses = /* @__PURE__ */ new Set(["succeeded", "partial", "failed"]);
-        for (let attempt = 0; attempt < maxAttempts; attempt++) {
-          const result = await this.requestWithRetry("poll", "poll failed:", () => designSystemImportGetOperation({
-            baseUrl: this.host,
-            headers: this.headers(),
-            path: { spaceId: this.spaceId, environmentId: this.environmentId, operationId },
-            parseAs: "json"
-          }));
-          if (!result.response.ok) {
-            throw new ApiError(`poll failed: ${result.response.status}`, result.response.status, stringifyError(result.error));
-          }
-          const op = result.data;
-          opts.onProgress?.(op);
-          if (terminalStatuses.has(op.sys.status))
-            return op;
-          if (attempt < maxAttempts - 1) {
-            const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
-            const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
-            const jitter = Math.random() * baseDelay * 0.15;
-            await new Promise((resolve2) => setTimeout(resolve2, baseDelay + jitter));
-          }
-        }
-        throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
-      }
-    };
   }
 });
 
@@ -4515,25 +4229,6 @@ var init_annotate_preview2 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-binding-diagnostics.js
-function parseBindingDiagnostics(body) {
-  if (!/binding configurations are invalid|Pointer path does not exist/i.test(body))
-    return null;
-  const locationMatches = [...body.matchAll(/(?:^|\.\s)([A-Za-z0-9_$-]+(?:\s*›\s*[A-Za-z0-9_$-]+){2,})/g)];
-  const location = locationMatches.at(-1)?.[1];
-  const pointerMessage = body.match(/Pointer path does not exist for '\[object Object\]':\s*(.+?)(?=\.\s*Default\s*›|$)/i)?.[1];
-  const graphQlMessage = body.match(/return GraphQL validation error:\s*(.+?)(?=\.\s*Default\s*›|$)/i)?.[1];
-  const heading = body.match(/^(.*?)(?=\.?\s*Pointer path does not exist|\.?\s*Default\s*›)/i)?.[1]?.trim();
-  const diagnostics = [];
-  if (pointerMessage)
-    diagnostics.push({ message: pointerMessage.trim(), ...location ? { path: location } : {} });
-  if (graphQlMessage)
-    diagnostics.push({ message: graphQlMessage.trim(), ...location ? { path: location } : {} });
-  return {
-    code: "BindingValidationFailed",
-    message: heading || "One or more binding configurations are invalid.",
-    ...diagnostics.length > 0 ? { diagnostics } : {}
-  };
-}
 var init_parse_binding_diagnostics = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-binding-diagnostics.js"() {
     "use strict";
@@ -4541,76 +4236,6 @@ var init_parse_binding_diagnostics = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/helpers.js
-function asRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
-}
-function displayValue(value) {
-  if (typeof value === "string")
-    return value;
-  if (typeof value === "number" || typeof value === "boolean")
-    return String(value);
-  if (value === null || value === void 0)
-    return null;
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return null;
-  }
-}
-function isPathSegment(value) {
-  return typeof value === "string" || typeof value === "number" && Number.isFinite(value);
-}
-function formatPath(value) {
-  if (isPathSegment(value))
-    return String(value) ? { path: String(value) } : { path: null };
-  if (Array.isArray(value)) {
-    const parts = value.filter(isPathSegment);
-    return parts.length > 0 ? { path: parts.join(" \u203A ") } : { path: null };
-  }
-  return {};
-}
-function componentFromPath(path5) {
-  if (!path5)
-    return void 0;
-  const manifestMatch = path5.match(/manifest:components\/([^/›]+)/);
-  if (manifestMatch?.[1])
-    return manifestMatch[1];
-  const parts = path5.split(/[›/]/).map((part) => part.trim()).filter(Boolean);
-  const componentsIndex = parts.findIndex((part) => part === "components");
-  return componentsIndex === -1 ? void 0 : parts[componentsIndex + 1];
-}
-function diagnosticMessage(error) {
-  const candidates = [
-    ["message", error.message],
-    ["details", error.details],
-    ["error", error.error],
-    ["name", error.name]
-  ];
-  for (const [messageSource, value] of candidates) {
-    const message = displayValue(value);
-    if (message !== null)
-      return { message, messageSource };
-  }
-  return { message: "Validation failed" };
-}
-function parseObjectLiteralTail(body) {
-  const braceStart = body.lastIndexOf("{");
-  if (braceStart === -1)
-    return null;
-  const tail = body.slice(braceStart);
-  const codeMatch = tail.match(/code:\s*['"]([^'"]+)['"]/);
-  const cycleMatch = tail.match(/cycle:\s*\[\s*([^\]]*)\s*\]/);
-  if (!codeMatch && !cycleMatch)
-    return null;
-  const code = codeMatch ? codeMatch[1] : null;
-  let cycle = null;
-  if (cycleMatch) {
-    cycle = cycleMatch[1].split(",").map((s) => s.trim().replace(/^['"]|['"]$/g, "")).filter((s) => s.length > 0);
-    if (cycle.length === 0)
-      cycle = null;
-  }
-  return { code, cycle };
-}
 var init_helpers3 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/helpers.js"() {
     "use strict";
@@ -4618,50 +4243,6 @@ var init_helpers3 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-json-body.js
-function parseValidationDiagnostics(details) {
-  if (!Array.isArray(details.errors))
-    return [];
-  const diagnostics = [];
-  for (const rawError of details.errors) {
-    const error = asRecord(rawError);
-    if (!error)
-      continue;
-    const location = formatPath(error.path);
-    const component = displayValue(error.component ?? error.componentName ?? error.componentId) ?? componentFromPath(location.path);
-    diagnostics.push({ ...diagnosticMessage(error), ...location, ...component ? { component } : {} });
-  }
-  return diagnostics;
-}
-function parseJsonBody(body) {
-  let parsed;
-  try {
-    parsed = JSON.parse(body);
-  } catch {
-    return null;
-  }
-  const p = asRecord(parsed);
-  if (!p)
-    return null;
-  const details = asRecord(p.details) ?? {};
-  const pick = (k) => p[k] !== void 0 ? p[k] : details[k];
-  const codeRaw = pick("code") ?? asRecord(p.sys)?.id;
-  const messageRaw = pick("message");
-  const cycleRaw = pick("cycle");
-  const out = {};
-  if (typeof codeRaw === "string")
-    out.code = codeRaw;
-  if (typeof messageRaw === "string")
-    out.message = messageRaw;
-  if (Array.isArray(cycleRaw)) {
-    const strs = cycleRaw.filter((x) => typeof x === "string");
-    if (strs.length > 0)
-      out.cycle = strs;
-  }
-  const diagnostics = parseValidationDiagnostics(details);
-  if (diagnostics.length > 0)
-    out.diagnostics = diagnostics;
-  return out;
-}
 var init_parse_json_body = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-json-body.js"() {
     "use strict";
@@ -4670,72 +4251,13 @@ var init_parse_json_body = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/strip-lambda-log-prefix.js
-function stripLambdaLogPrefix(body) {
-  return body.replace(LAMBDA_LOG_PREFIX_RE, "").replace(DD_TAG_RE, "").trim();
-}
-var LAMBDA_LOG_PREFIX_RE, DD_TAG_RE;
 var init_strip_lambda_log_prefix = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/strip-lambda-log-prefix.js"() {
     "use strict";
-    LAMBDA_LOG_PREFIX_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z\s+[0-9a-f-]+\s+ERROR\s+(?:\[dd\.[^\]]*\]\s*)?/;
-    DD_TAG_RE = /\[dd\.(?:trace_id|span_id)=[^\]]*\]\s*/g;
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-edsi-error.js
-function parseEdsiError(rawInput) {
-  if (!rawInput)
-    return { code: null, message: "", cycle: null, raw: true };
-  const { body, prefix } = splitPhasePrefix(rawInput);
-  const cleaned = stripLambdaLogPrefix(body);
-  const json = parseJsonBody(cleaned) ?? parseJsonBody(body);
-  const bindingFromJson = typeof json?.message === "string" ? parseBindingDiagnostics(json.message) : null;
-  if (bindingFromJson) {
-    return {
-      code: bindingFromJson.code ?? json?.code ?? null,
-      message: bindingFromJson.message ?? cleaned,
-      cycle: null,
-      raw: false,
-      ...bindingFromJson.diagnostics ? { diagnostics: bindingFromJson.diagnostics } : {}
-    };
-  }
-  if (json && (json.code || json.message || json.cycle)) {
-    return {
-      code: json.code ?? null,
-      message: json.message ?? (cleaned || prefix),
-      cycle: json.cycle ?? null,
-      raw: false,
-      ...json.diagnostics ? { diagnostics: json.diagnostics } : {}
-    };
-  }
-  const binding = parseBindingDiagnostics(cleaned);
-  if (binding) {
-    return {
-      code: binding.code ?? null,
-      message: binding.message ?? cleaned,
-      cycle: null,
-      raw: false,
-      ...binding.diagnostics ? { diagnostics: binding.diagnostics } : {}
-    };
-  }
-  const literal2 = parseObjectLiteralTail(cleaned);
-  if (literal2 && (literal2.code || literal2.cycle)) {
-    const braceStart = cleaned.lastIndexOf("{");
-    const head = braceStart === -1 ? cleaned : cleaned.slice(0, braceStart).trim();
-    return { code: literal2.code ?? null, message: head || cleaned, cycle: literal2.cycle ?? null, raw: false };
-  }
-  return { code: null, message: cleaned || prefix || rawInput, cycle: null, raw: true };
-}
-function splitPhasePrefix(input) {
-  const nlIndex = input.indexOf("\n");
-  if (nlIndex === -1)
-    return { body: input, prefix: "" };
-  const firstLine = input.slice(0, nlIndex);
-  if (!API_ERROR_PREFIX_RE.test(firstLine))
-    return { body: input, prefix: "" };
-  return { body: input.slice(nlIndex + 1), prefix: firstLine };
-}
-var API_ERROR_PREFIX_RE;
 var init_parse_edsi_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-edsi-error.js"() {
     "use strict";
@@ -4743,51 +4265,10 @@ var init_parse_edsi_error = __esm({
     init_parse_json_body();
     init_helpers3();
     init_strip_lambda_log_prefix();
-    API_ERROR_PREFIX_RE = /^(?:apply|preview|poll) failed: \d+$/;
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-parsed-edsi-error.js
-function formatParsedEdsiError(parsed, opts = {}) {
-  const lines = [];
-  if (parsed.code)
-    lines.push(`[${parsed.code}]`);
-  if (parsed.message)
-    lines.push(parsed.message);
-  for (const diagnostic of parsed.diagnostics ?? []) {
-    const context = [
-      diagnostic.component ? `Component: ${diagnostic.component}` : null,
-      diagnostic.path ? `Path: ${diagnostic.path}` : null
-    ].filter(Boolean);
-    lines.push(`- ${diagnostic.message}${context.length > 0 ? ` (${context.join("; ")})` : ""}`);
-    if (diagnostic.path === null) {
-      lines.push("  Location: not provided by the server. Review the submitted CDF file; no component or field was identified.");
-    }
-    if (opts.verbose && diagnostic.messageSource) {
-      lines.push(`  Message field: ${diagnostic.messageSource}`);
-    }
-  }
-  if (parsed.code === "BindingValidationFailed") {
-    const location = parsed.diagnostics?.find((d) => d.path)?.path;
-    lines.push(location ? `Next action: review the binding at ${location} and correct its pointer or GraphQL selection.` : "Next action: review the binding pointer and GraphQL selection.");
-  }
-  if (parsed.code === "AccessDenied") {
-    lines.push("Next action: this operation requires DesignToken and Component permissions in this environment. Ask a Contentful admin to grant both on your role.");
-  }
-  if (parsed.code === "NotFound") {
-    lines.push("Next action: verify the resource id is correct. If it should exist, your role may lack read permission on DesignToken or Component.");
-  }
-  if (parsed.cycle && parsed.cycle.length > 0) {
-    lines.push(`Cycle: ${parsed.cycle.join(" \u2192 ")} \u2192 ${parsed.cycle[0]}`);
-    lines.push("Break the cycle by removing at least one $allowedComponents entry.");
-  }
-  if (opts.verbose && opts.raw) {
-    lines.push("");
-    lines.push("--- raw ---");
-    lines.push(opts.raw);
-  }
-  return lines.filter(Boolean).join("\n");
-}
 var init_format_parsed_edsi_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-parsed-edsi-error.js"() {
     "use strict";
@@ -4795,12 +4276,6 @@ var init_format_parsed_edsi_error = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-edsi-error.js
-function formatEdsiError(raw, opts = {}) {
-  const input = typeof raw === "string" ? raw : displayValue(raw);
-  if (!input)
-    return "";
-  return formatParsedEdsiError(parseEdsiError(input), { ...opts, raw: opts.raw ?? input });
-}
 var init_format_edsi_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-edsi-error.js"() {
     "use strict";
@@ -4811,14 +4286,6 @@ var init_format_edsi_error = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-api-error.js
-function formatApiError(error, verbose = false) {
-  const formatted = formatEdsiError(error.body || error.message, { verbose, raw: error.body }) || error.message;
-  const phase = error.message.split("\n", 1)[0];
-  const withPhase = /^(?:apply|preview|poll) failed: \d+$/.test(phase) && formatted !== phase ? `${phase}
-${formatted}` : formatted;
-  return error.guidance ? `${withPhase}
-${error.guidance}` : withPhase;
-}
 var init_format_api_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-api-error.js"() {
     "use strict";
@@ -4855,9 +4322,6 @@ var init_format_edsi_error2 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/controller/errors/format-api-error.js
-function formatApiError2(request) {
-  return formatApiError(request.error, request.verbose ?? false);
-}
 var init_format_api_error2 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/controller/errors/format-api-error.js"() {
     "use strict";
@@ -5367,12 +4831,21 @@ function keyAction2(input, key) {
 function nextField(field) {
   return FIELDS[(FIELDS.indexOf(field) + 1) % FIELDS.length];
 }
+function toConfiguredHost3(host) {
+  const value = (host ?? "").trim().replace(/\/+$/, "");
+  return value === "" ? DEFAULT_HOST : value.replace(/^https:\/\//i, "");
+}
+function toApiHost3(host) {
+  const value = host.trim().replace(/\/+$/, "");
+  if (value === "") return `https://${DEFAULT_HOST}`;
+  return /^[a-z][a-z\d+\-.]*:\/\//i.test(value) ? value : `https://${value}`;
+}
 function normalize(values) {
   return {
     spaceId: values.spaceId.trim(),
     environmentId: values.environmentId.trim(),
     cmaToken: values.cmaToken.trim(),
-    host: toConfiguredHost2(values.host) ?? DEFAULT_CONFIGURED_HOST
+    host: toConfiguredHost3(values.host)
   };
 }
 function missingField(values) {
@@ -5381,12 +4854,12 @@ function missingField(values) {
 function isUnchanged(current, initial) {
   return FIELDS.every((field) => current[field] === initial[field]);
 }
-var FIELDS;
+var FIELDS, DEFAULT_HOST;
 var init_logic4 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/04-credentials/logic.ts"() {
     "use strict";
-    init_src3();
     FIELDS = ["spaceId", "environmentId", "cmaToken", "host"];
+    DEFAULT_HOST = "api.contentful.com";
   }
 });
 
@@ -5416,35 +4889,65 @@ var init_controls4 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/04-credentials/validate.ts
+function headers(token) {
+  return { Authorization: `Bearer ${token}`, "X-Contentful-User-Agent": USER_AGENT2 };
+}
+function isApsDenial(body) {
+  try {
+    const id = JSON.parse(body).sys?.id;
+    return id === "NotFound" || id === "AccessDenied";
+  } catch {
+    return false;
+  }
+}
+function messageFrom(body) {
+  try {
+    const message = JSON.parse(body).message;
+    return typeof message === "string" && message !== "" ? message : void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function validateCredentials(values) {
-  const host = toApiHost2(values.host);
-  const client2 = new ApiClient({
-    host,
-    spaceId: values.spaceId,
-    environmentId: values.environmentId,
-    cmaToken: values.cmaToken
-  });
+  const base = toApiHost3(values.host);
+  let me;
   try {
-    await client2.validateToken();
-    return { ok: true };
+    me = await fetch(`${base}/users/me`, { headers: headers(values.cmaToken) });
   } catch (error) {
-    return { ok: false, error: toUserError(error, host) };
+    return { ok: false, error: `Could not reach ${base}: ${error instanceof Error ? error.message : String(error)}` };
   }
-}
-function toUserError(error, host) {
-  if (error instanceof ApiError) {
-    if (error.status === 404 && error.message.startsWith("preflight failed:")) {
-      return "Not found. Check the space ID, environment and API host.";
-    }
-    return formatApiError2({ error });
+  if (me.status === 401) return { ok: false, error: "CMA token is invalid or revoked." };
+  if (!me.ok) return { ok: false, error: `Unexpected error validating the token (${me.status}).` };
+  let preflight;
+  try {
+    preflight = await fetch(
+      `${base}/spaces/${values.spaceId}/environments/${values.environmentId}/design_systems/preflight`,
+      { headers: headers(values.cmaToken) }
+    );
+  } catch {
+    return { ok: true };
+  }
+  if (preflight.ok || preflight.status >= 500) return { ok: true };
+  const body = await preflight.text();
+  if (preflight.status === 404 && !isApsDenial(body)) return { ok: true };
+  const detail = messageFrom(body);
+  if (preflight.status === 403) {
+    return { ok: false, error: `Access denied. ${detail ?? "Your token cannot write design system components here."}` };
+  }
+  if (preflight.status === 404) {
+    return {
+      ok: false,
+      error: `Not found. Check the space ID, environment and API host.${detail ? ` (${detail})` : ""}`
+    };
   }
-  if (error instanceof Error) return `Could not reach ${host}: ${error.message}`;
-  return String(error);
+  return { ok: false, error: `Credential check failed (${preflight.status}).${detail ? ` ${detail}` : ""}` };
 }
+var USER_AGENT2;
 var init_validate4 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/04-credentials/validate.ts"() {
     "use strict";
-    init_src3();
+    init_logic4();
+    USER_AGENT2 = "app contentful.experience-design-system-cli";
   }
 });
 
@@ -5519,7 +5022,7 @@ function CredentialsScreen({
           value: values[field],
           focus: active === field && !validating,
           mask: field === "cmaToken" ? "\u2022" : void 0,
-          placeholder: field === "host" ? DEFAULT_CONFIGURED_HOST : void 0,
+          placeholder: field === "host" ? DEFAULT_HOST : void 0,
           onChange: change(field),
           onSubmit: () => void submit(field)
         }
@@ -5546,7 +5049,6 @@ var init_screen4 = __esm({
     "use strict";
     init_home_theme();
     init_controls4();
-    init_src3();
     init_logic4();
     init_validate4();
     LABELS = {
@@ -5558,6 +5060,234 @@ var init_screen4 = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/tui/import/shared/error-step/logic.ts
+var init_logic5 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/error-step/logic.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/error-step/controls.ts
+import { useInput as useInput7 } from "ink";
+var init_controls5 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/error-step/controls.ts"() {
+    "use strict";
+    init_logic5();
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/error-step/error-step.tsx
+import { Box as Box7, Text as Text8 } from "ink";
+import { jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
+var init_error_step = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/error-step/error-step.tsx"() {
+    "use strict";
+    init_home_theme();
+    init_controls5();
+    init_logic5();
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/gate-step/logic.ts
+function gateAction(input, key, canSkip) {
+  if (key.return) return "continue";
+  if (input === "a" && canSkip) return "skip";
+  if (key.escape) return "quit";
+  return null;
+}
+function gateControls(continueLabel, skipLabel, canSkip) {
+  return [
+    { keys: "Enter", label: continueLabel },
+    ...canSkip ? [{ keys: "a", label: skipLabel }] : [],
+    { keys: "Esc", label: "Quit" }
+  ];
+}
+var init_logic6 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/gate-step/logic.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/gate-step/controls.ts
+import { useInput as useInput8 } from "ink";
+function useGateControls(handlers) {
+  useInput8((input, key) => {
+    const action = gateAction(input, key, handlers.canSkip);
+    if (action === "continue") handlers.onContinue();
+    else if (action === "skip") handlers.onSkip();
+    else if (action === "quit") handlers.onQuit();
+  });
+}
+var init_controls6 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/gate-step/controls.ts"() {
+    "use strict";
+    init_logic6();
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/gate-step/gate-step.tsx
+import { Box as Box8, Text as Text9 } from "ink";
+import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
+function GateStep({
+  message,
+  onContinue,
+  onQuit,
+  summary,
+  context,
+  continueLabel = "Continue",
+  skipLabel = "Approve all and skip",
+  onSkip,
+  intent = "success"
+}) {
+  useGateControls({ canSkip: onSkip !== void 0, onContinue, onSkip: onSkip ?? (() => {
+  }), onQuit });
+  const color = intent === "error" ? PALETTE.error : PALETTE.success;
+  const icon = intent === "error" ? "\u2717" : "\u2713";
+  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsxs8(Text9, { color, children: [
+      icon,
+      " ",
+      message
+    ] }),
+    summary && /* @__PURE__ */ jsx9(Text9, { color: PALETTE.muted, children: summary }),
+    context && /* @__PURE__ */ jsx9(Box8, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text9, { children: context }) }),
+    /* @__PURE__ */ jsx9(Box8, { marginTop: 1, gap: 3, children: gateControls(continueLabel, skipLabel, onSkip !== void 0).map((control) => /* @__PURE__ */ jsxs8(Text9, { dimColor: true, children: [
+      "[",
+      control.keys,
+      "] ",
+      control.label
+    ] }, control.keys)) })
+  ] });
+}
+var init_gate_step = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/gate-step/gate-step.tsx"() {
+    "use strict";
+    init_home_theme();
+    init_controls6();
+    init_logic6();
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/running-step/logic.ts
+var init_logic7 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/running-step/logic.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/running-step/theme.ts
+import { defaultTheme, extendTheme } from "@inkjs/ui";
+var PROGRESS_THEME;
+var init_theme = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/running-step/theme.ts"() {
+    "use strict";
+    PROGRESS_THEME = extendTheme(defaultTheme, {
+      components: {
+        ProgressBar: {
+          styles: {
+            completed: () => ({ color: "blue" })
+          }
+        }
+      }
+    });
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/running-step/use-elapsed.ts
+import { useEffect as useEffect4, useState as useState7 } from "react";
+var init_use_elapsed = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/running-step/use-elapsed.ts"() {
+    "use strict";
+    init_logic7();
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/running-step/running-step.tsx
+import { Box as Box9, Text as Text10 } from "ink";
+import { ProgressBar, Spinner, ThemeProvider } from "@inkjs/ui";
+import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
+var RULE2;
+var init_running_step = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/running-step/running-step.tsx"() {
+    "use strict";
+    init_home_theme();
+    init_logic7();
+    init_theme();
+    init_use_elapsed();
+    RULE2 = "\u2500".repeat(40);
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/shared/index.ts
+var init_shared2 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/shared/index.ts"() {
+    "use strict";
+    init_error_step();
+    init_gate_step();
+    init_running_step();
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/steps/05-token-reuse/logic.ts
+import { access, stat } from "node:fs/promises";
+import { join as join5 } from "node:path";
+async function inspectTokens({ rawTokensPath, outDir, cache }) {
+  if (!cache) return { kind: "none" };
+  const tokensPath = join5(outDir, "tokens.json");
+  try {
+    await access(tokensPath);
+  } catch {
+    return { kind: "none" };
+  }
+  const [generated, source] = await Promise.all([stat(tokensPath), stat(rawTokensPath).catch(() => null)]);
+  return { kind: "cached", tokensPath, sourceChanged: source ? source.mtimeMs > generated.mtimeMs : false };
+}
+function gateText({ tokensPath, sourceChanged }) {
+  const summary = sourceChanged ? `Source file has been modified since tokens were last generated.
+
+Tokens Path: ${tokensPath}` : `Source file has not changed since tokens were last generated.
+
+Tokens Path: ${tokensPath}`;
+  return sourceChanged ? { summary, context: "The source tokens file changed \u2014 regenerating is recommended." } : { summary };
+}
+var init_logic8 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/steps/05-token-reuse/logic.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/tui/import/steps/05-token-reuse/screen.tsx
+import { jsx as jsx11 } from "react/jsx-runtime";
+function TokenReuseScreen({
+  tokensPath,
+  sourceChanged,
+  onReuse,
+  onRegenerate,
+  onQuit
+}) {
+  const { summary, context } = gateText({ tokensPath, sourceChanged });
+  return /* @__PURE__ */ jsx11(
+    GateStep,
+    {
+      message: "Existing tokens.json found",
+      summary,
+      context,
+      continueLabel: "Reuse existing tokens",
+      skipLabel: "Regenerate tokens",
+      onContinue: onReuse,
+      onSkip: onRegenerate,
+      onQuit
+    }
+  );
+}
+var init_screen5 = __esm({
+  "packages/experience-design-system-cli/src/tui/import/steps/05-token-reuse/screen.tsx"() {
+    "use strict";
+    init_shared2();
+    init_logic8();
+  }
+});
+
 // packages/experience-design-system-cli/src/tui/import/steps/index.ts
 var init_steps = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/index.ts"() {
@@ -5566,6 +5296,7 @@ var init_steps = __esm({
     init_screen2();
     init_screen3();
     init_screen4();
+    init_screen5();
   }
 });
 
@@ -5579,15 +5310,23 @@ function buildArgs2(options) {
   if (options.tokens) {
     args.push("--tokens", options.tokens);
   }
+  args.push(...importOptionArgs({ agent: options.agent, prompt: options.prompt ?? [], cache: options.cache ?? true }));
   return args;
 }
+function buildEnv(options, base = process.env) {
+  return {
+    ...base,
+    ...options.skipCredentials ? { EDS_IMPORT_SKIP_CREDENTIALS: "1" } : {},
+    ...options.tokenStrategy ? { EDS_IMPORT_TOKENS: options.tokenStrategy } : {}
+  };
+}
 async function spawnV1Import(options = {}) {
   const cliPath = findLegacyCliPath();
   const args = buildArgs2(options);
   return new Promise((resolvePromise) => {
     const child = spawn3("node", [cliPath, ...args], {
       stdio: "inherit",
-      env: options.skipCredentials ? { ...process.env, EDS_IMPORT_SKIP_CREDENTIALS: "1" } : process.env
+      env: buildEnv(options)
     });
     child.on("close", (code) => {
       resolvePromise({ exitCode: code ?? 1, result: void 0, stdout: "", stderr: "" });
@@ -5601,6 +5340,7 @@ var init_spawn_v1_import = __esm({
   "packages/experience-design-system-cli/src/tui/import/spawn-v1-import.ts"() {
     "use strict";
     init_legacy_cli_path();
+    init_import_options();
   }
 });
 
@@ -5631,9 +5371,9 @@ var init_terminal_input = __esm({
 import { randomBytes } from "node:crypto";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { dirname as dirname2, join as join5 } from "node:path";
+import { dirname as dirname2, join as join6 } from "node:path";
 function configRoot2() {
-  return process.env["EDS_HOME"] || join5(homedir2(), ".contentful", "experience-design-system-cli");
+  return process.env["EDS_HOME"] || join6(homedir2(), ".contentful", "experience-design-system-cli");
 }
 async function readSettings2() {
   try {
@@ -5657,10 +5397,10 @@ var configFilePath2, runsFilePath2, debugSessionsDir2, oldConfigDir2;
 var init_config = __esm({
   "packages/experience-design-system-types/dist/src/config/index.js"() {
     "use strict";
-    configFilePath2 = () => join5(configRoot2(), "config.json");
-    runsFilePath2 = () => join5(configRoot2(), "state", "runs.json");
-    debugSessionsDir2 = () => join5(configRoot2(), "debug", "sessions");
-    oldConfigDir2 = () => join5(homedir2(), ".config", "experiences");
+    configFilePath2 = () => join6(configRoot2(), "config.json");
+    runsFilePath2 = () => join6(configRoot2(), "state", "runs.json");
+    debugSessionsDir2 = () => join6(configRoot2(), "debug", "sessions");
+    oldConfigDir2 = () => join6(homedir2(), ".config", "experiences");
   }
 });
 
@@ -5686,7 +5426,7 @@ var init_debug_mode_store = __esm({
 // packages/experience-design-system-cli/src/tui/debug-store.ts
 import { mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
 import { existsSync as existsSync4, readdirSync as readdirSync2 } from "node:fs";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 function generateRunId() {
   const now = /* @__PURE__ */ new Date();
   const pad = (n) => String(n).padStart(2, "0");
@@ -5711,7 +5451,7 @@ function generateSessionId3() {
   return `${today}-session-${maxSeq + 1}`;
 }
 function sessionDebugDir() {
-  return join6(debugSessionsDir2(), SESSION_ID);
+  return join7(debugSessionsDir2(), SESSION_ID);
 }
 function currentDebugSessionDir() {
   return sessionDebugDir();
@@ -5756,10 +5496,10 @@ async function finishDebugRun({
   const durationMs = Date.now() - run.startedAt;
   const content = renderMarkdown(run, { outputs: redact(outputs), status, exitMethod, durationMs });
   const flowSegments = run.flow.split("/");
-  const dir = join6(sessionDebugDir(), ...flowSegments);
+  const dir = join7(sessionDebugDir(), ...flowSegments);
   await mkdir2(dir, { recursive: true });
   const filename = nextAttemptFilename(dir, run.menuOption);
-  await writeFile2(join6(dir, filename), content, { mode: 384 });
+  await writeFile2(join7(dir, filename), content, { mode: 384 });
 }
 function nextAttemptFilename(dir, menuOption) {
   const today = datePrefix();
@@ -5774,13 +5514,13 @@ function nextAttemptFilename(dir, menuOption) {
 }
 function renderMarkdown(run, finish) {
   const stepMatch = /^(\d+)-(.+)$/.exec(run.step);
-  const stepLabel = stepMatch ? `${stepMatch[1]} - ${stepMatch[2]}` : 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: ${stepLabel}
+- Step: ${stepLabel2}
 - Menu option: ${run.menuOption}
 - Date: ${(/* @__PURE__ */ new Date()).toISOString()}
 - CLI version: ${readPackageVersion()}
@@ -5865,21 +5605,21 @@ var init_help_info = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/help/PageContainer.tsx
-import { useEffect as useEffect4, useState as useState7 } from "react";
-import { Box as Box7, Text as Text8, useInput as useInput7 } from "ink";
-import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
+import { useEffect as useEffect5, useState as useState8 } from "react";
+import { Box as Box10, Text as Text11, useInput as useInput9 } from "ink";
+import { Fragment as Fragment2, jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
 function Section({ title, rows }) {
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx8(Text8, { bold: true, color: PALETTE.accent, children: title }),
-    rows.map((row) => /* @__PURE__ */ jsxs7(Box7, { gap: 1, children: [
-      /* @__PURE__ */ jsx8(Box7, { width: 14, flexShrink: 0, children: /* @__PURE__ */ jsx8(Text8, { color: PALETTE.muted, children: row.label }) }),
-      /* @__PURE__ */ jsx8(Text8, { children: row.value })
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx12(Text11, { bold: true, color: PALETTE.accent, children: title }),
+    rows.map((row) => /* @__PURE__ */ jsxs10(Box10, { gap: 1, children: [
+      /* @__PURE__ */ jsx12(Box10, { width: 14, flexShrink: 0, children: /* @__PURE__ */ jsx12(Text11, { color: PALETTE.muted, children: row.label }) }),
+      /* @__PURE__ */ jsx12(Text11, { children: row.value })
     ] }, row.label))
   ] });
 }
 function HelpScreen({ onDone }) {
-  const [info, setInfo] = useState7();
-  useEffect4(() => {
+  const [info, setInfo] = useState8();
+  useEffect5(() => {
     startDebugRun({ flow: "help", step: "01-help", menuOption: "Help", inputs: {} });
     void readHelpInfo().then(setInfo);
   }, []);
@@ -5887,7 +5627,7 @@ function HelpScreen({ onDone }) {
     void finishDebugRun({ outputs: {}, status: "success", exitMethod });
     onDone();
   };
-  useInput7((input, key) => {
+  useInput9((input, key) => {
     if (key.return) {
       leave("saved");
       return;
@@ -5897,14 +5637,14 @@ function HelpScreen({ onDone }) {
       return;
     }
   });
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingX: 2, paddingY: 1, gap: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { bold: true, children: "Help" }),
-    info ? /* @__PURE__ */ jsxs7(Fragment2, { children: [
-      /* @__PURE__ */ jsx8(Section, { title: "Where things are stored", rows: info.storage }),
-      /* @__PURE__ */ jsx8(Section, { title: "Troubleshooting", rows: info.troubleshooting }),
-      /* @__PURE__ */ jsx8(Text8, { color: PALETTE.muted, children: "Hit a problem? Turn on Debug Mode in Settings, reproduce it, then share the session folder above. The CMA token is redacted from those logs." })
-    ] }) : /* @__PURE__ */ jsx8(Text8, { color: PALETTE.accent, children: "Loading..." }),
-    /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", paddingX: 2, paddingY: 1, gap: 1, children: [
+    /* @__PURE__ */ jsx12(Text11, { bold: true, children: "Help" }),
+    info ? /* @__PURE__ */ jsxs10(Fragment2, { children: [
+      /* @__PURE__ */ jsx12(Section, { title: "Where things are stored", rows: info.storage }),
+      /* @__PURE__ */ jsx12(Section, { title: "Troubleshooting", rows: info.troubleshooting }),
+      /* @__PURE__ */ jsx12(Text11, { color: PALETTE.muted, children: "Hit a problem? Turn on Debug Mode in Settings, reproduce it, then share the session folder above. The CMA token is redacted from those logs." })
+    ] }) : /* @__PURE__ */ jsx12(Text11, { color: PALETTE.accent, children: "Loading..." }),
+    /* @__PURE__ */ jsx12(
       ControlHints,
       {
         hints: [
@@ -5926,20 +5666,20 @@ var init_PageContainer2 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/PageContainer.tsx
-import { useState as useState8 } from "react";
-import { Box as Box8, Text as Text9, useInput as useInput8 } from "ink";
-import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
+import { useState as useState9 } from "react";
+import { Box as Box11, Text as Text12, useInput as useInput10 } from "ink";
+import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
 function SettingsScreen({
   onNavigate,
   onBack
 }) {
-  const [focusIdx, setFocusIdx] = useState8(0);
+  const [focusIdx, setFocusIdx] = useState9(0);
   const items = [
     { label: "Configuration", screen: "settings-configuration" },
     { label: "Opt-in Analytics", screen: "settings-opt-in-analytics" },
     { label: "Debug Mode", screen: "settings-debug-mode" }
   ];
-  useInput8((input, key) => {
+  useInput10((input, key) => {
     if (key.upArrow) {
       setFocusIdx((i) => (i - 1 + items.length) % items.length);
       return;
@@ -5959,15 +5699,15 @@ function SettingsScreen({
       onBack();
     }
   });
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx9(Text9, { bold: true, children: "Settings" }),
-    /* @__PURE__ */ jsx9(Text9, { children: " " }),
-    items.map((item, i) => /* @__PURE__ */ jsxs8(Text9, { color: i === focusIdx ? "cyan" : void 0, children: [
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx13(Text12, { bold: true, children: "Settings" }),
+    /* @__PURE__ */ jsx13(Text12, { children: " " }),
+    items.map((item, i) => /* @__PURE__ */ jsxs11(Text12, { color: i === focusIdx ? "cyan" : void 0, children: [
       i === focusIdx ? "> " : "  ",
       item.label
     ] }, item.label)),
-    /* @__PURE__ */ jsx9(Text9, { children: " " }),
-    /* @__PURE__ */ jsx9(
+    /* @__PURE__ */ jsx13(Text12, { children: " " }),
+    /* @__PURE__ */ jsx13(
       ControlHints,
       {
         hints: [
@@ -6028,10 +5768,10 @@ var init_config_store = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
-import { useEffect as useEffect5, useState as useState9 } from "react";
-import { Box as Box9, Text as Text10, useInput as useInput9 } from "ink";
+import { useEffect as useEffect6, useState as useState10 } from "react";
+import { Box as Box12, Text as Text13, useInput as useInput11 } from "ink";
 import TextInput4 from "ink-text-input";
-import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 function debugFields(config) {
   return {
     space_id: config?.spaceId ?? "",
@@ -6043,14 +5783,14 @@ function debugFields(config) {
   };
 }
 function ConfigurationScreen({ onDone }) {
-  const [stage, setStage] = useState9("loading");
-  const [config, setConfig] = useState9(null);
-  const [activeField, setActiveField] = useState9("spaceId");
-  const [notice, setNotice] = useState9(null);
-  const [lastSaved, setLastSaved] = useState9(null);
-  const [editing, setEditing] = useState9(false);
-  const [valueBeforeEdit, setValueBeforeEdit] = useState9("");
-  useEffect5(() => {
+  const [stage, setStage] = useState10("loading");
+  const [config, setConfig] = useState10(null);
+  const [activeField, setActiveField] = useState10("spaceId");
+  const [notice, setNotice] = useState10(null);
+  const [lastSaved, setLastSaved] = useState10(null);
+  const [editing, setEditing] = useState10(false);
+  const [valueBeforeEdit, setValueBeforeEdit] = useState10("");
+  useEffect6(() => {
     readCredentials().then((cfg) => {
       setConfig(cfg);
       setStage("form");
@@ -6090,7 +5830,7 @@ function ConfigurationScreen({ onDone }) {
     );
     onDone();
   }
-  useInput9((input, key) => {
+  useInput11((input, key) => {
     if (stage === "loading" || stage === "saving") return;
     if (editing) {
       if (key.escape) {
@@ -6127,26 +5867,26 @@ function ConfigurationScreen({ onDone }) {
     }
   });
   if (stage === "loading") {
-    return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx10(Text10, { bold: true, children: "Configuration" }),
-      /* @__PURE__ */ jsx10(Text10, { children: " " }),
-      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.accent, children: "Loading..." })
+    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+      /* @__PURE__ */ jsx14(Text13, { bold: true, children: "Configuration" }),
+      /* @__PURE__ */ jsx14(Text13, { children: " " }),
+      /* @__PURE__ */ jsx14(Text13, { color: PALETTE.accent, children: "Loading..." })
     ] });
   }
-  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx10(Text10, { bold: true, children: "Configuration" }),
-    /* @__PURE__ */ jsx10(Text10, { children: " " }),
-    /* @__PURE__ */ jsx10(Box9, { flexDirection: "column", children: FIELD_ORDER.map((field) => {
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx14(Text13, { bold: true, children: "Configuration" }),
+    /* @__PURE__ */ jsx14(Text13, { children: " " }),
+    /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", children: FIELD_ORDER.map((field) => {
       const isActive = activeField === field;
       const value = fieldValue(field);
       const display = field === "cmaToken" ? "\u2022".repeat(value.length) : value;
-      return /* @__PURE__ */ jsxs9(Box9, { gap: 1, children: [
-        /* @__PURE__ */ jsx10(Text10, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
-        /* @__PURE__ */ jsxs9(Text10, { bold: isActive, children: [
+      return /* @__PURE__ */ jsxs12(Box12, { gap: 1, children: [
+        /* @__PURE__ */ jsx14(Text13, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
+        /* @__PURE__ */ jsxs12(Text13, { bold: isActive, children: [
           FIELD_LABELS[field],
           ":"
         ] }),
-        isActive && editing ? /* @__PURE__ */ jsx10(
+        isActive && editing ? /* @__PURE__ */ jsx14(
           TextInput4,
           {
             value,
@@ -6154,19 +5894,19 @@ function ConfigurationScreen({ onDone }) {
             onSubmit: () => setEditing(false),
             mask: field === "cmaToken" ? "\u2022" : void 0
           }
-        ) : /* @__PURE__ */ jsx10(Text10, { children: display || /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: "(empty)" }) })
+        ) : /* @__PURE__ */ jsx14(Text13, { children: display || /* @__PURE__ */ jsx14(Text13, { color: PALETTE.muted, children: "(empty)" }) })
       ] }, field);
     }) }),
-    notice && /* @__PURE__ */ jsxs9(Fragment3, { children: [
-      /* @__PURE__ */ jsx10(Text10, { children: " " }),
-      /* @__PURE__ */ jsxs9(Text10, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
+    notice && /* @__PURE__ */ jsxs12(Fragment3, { children: [
+      /* @__PURE__ */ jsx14(Text13, { children: " " }),
+      /* @__PURE__ */ jsxs12(Text13, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
         notice.kind === "success" ? "\u2713" : "\u2717",
         " ",
         notice.text
       ] })
     ] }),
-    /* @__PURE__ */ jsx10(Text10, { children: " " }),
-    /* @__PURE__ */ jsx10(
+    /* @__PURE__ */ jsx14(Text13, { children: " " }),
+    /* @__PURE__ */ jsx14(
       ControlHints,
       {
         hints: editing ? [
@@ -6234,13 +5974,13 @@ var init_analytics_store = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx
-import { useEffect as useEffect6, useState as useState10 } from "react";
-import { Box as Box10, Text as Text11, useInput as useInput10 } from "ink";
-import { Fragment as Fragment4, jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
+import { useEffect as useEffect7, useState as useState11 } from "react";
+import { Box as Box13, Text as Text14, useInput as useInput12 } from "ink";
+import { Fragment as Fragment4, jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 function OptInAnalyticsScreen({ onDone }) {
-  const [loading, setLoading] = useState10(true);
-  const [enabled, setEnabled] = useState10(true);
-  useEffect6(() => {
+  const [loading, setLoading] = useState11(true);
+  const [enabled, setEnabled] = useState11(true);
+  useEffect7(() => {
     readAnalyticsSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -6252,7 +5992,7 @@ function OptInAnalyticsScreen({ onDone }) {
       });
     });
   }, []);
-  useInput10((input, key) => {
+  useInput12((input, key) => {
     if (loading) return;
     if (key.return || input === " ") {
       setEnabled((current) => {
@@ -6267,21 +6007,21 @@ function OptInAnalyticsScreen({ onDone }) {
       onDone();
     }
   });
-  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Settings \u203A Opt-in Analytics" }),
-    /* @__PURE__ */ jsx11(Text11, { children: " " }),
-    loading ? /* @__PURE__ */ jsx11(Text11, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs10(Fragment4, { children: [
-      /* @__PURE__ */ jsxs10(Text11, { children: [
+  return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx15(Text14, { bold: true, children: "Settings \u203A Opt-in Analytics" }),
+    /* @__PURE__ */ jsx15(Text14, { children: " " }),
+    loading ? /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs13(Fragment4, { children: [
+      /* @__PURE__ */ jsxs13(Text14, { children: [
         "Share anonymous usage data:",
         " ",
-        /* @__PURE__ */ jsx11(Text11, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
+        /* @__PURE__ */ jsx15(Text14, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
       ] }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsx11(Text11, { color: PALETTE.muted, children: "Shares which CLI commands are used and where imports succeed or fail." }),
-      /* @__PURE__ */ jsx11(Text11, { color: PALETTE.muted, children: "Never includes source code, file paths, credentials, or authored content." })
+      /* @__PURE__ */ jsx15(Text14, { children: " " }),
+      /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Shares which CLI commands are used and where imports succeed or fail." }),
+      /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Never includes source code, file paths, credentials, or authored content." })
     ] }),
-    /* @__PURE__ */ jsx11(Text11, { children: " " }),
-    /* @__PURE__ */ jsx11(
+    /* @__PURE__ */ jsx15(Text14, { children: " " }),
+    /* @__PURE__ */ jsx15(
       ControlHints,
       {
         hints: [
@@ -6292,7 +6032,7 @@ function OptInAnalyticsScreen({ onDone }) {
     )
   ] });
 }
-var init_screen5 = __esm({
+var init_screen6 = __esm({
   "packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx"() {
     "use strict";
     init_home_theme();
@@ -6303,12 +6043,12 @@ var init_screen5 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/upgrade/PageContainer.tsx
-import { useEffect as useEffect7, useState as useState11 } from "react";
-import { Box as Box11, Text as Text12, useInput as useInput11 } from "ink";
-import { jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
+import { useEffect as useEffect8, useState as useState12 } from "react";
+import { Box as Box14, Text as Text15, useInput as useInput13 } from "ink";
+import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 function UpgradeScreen({ onDone }) {
-  const [upgradeCheck, setUpgradeCheck] = useState11();
-  useEffect7(() => {
+  const [upgradeCheck, setUpgradeCheck] = useState12();
+  useEffect8(() => {
     startDebugRun({
       flow: "upgrade",
       step: "01-upgrade",
@@ -6317,7 +6057,7 @@ function UpgradeScreen({ onDone }) {
     });
     checkForUpgrade().then(setUpgradeCheck).catch(() => setUpgradeCheck({ status: "error" }));
   }, []);
-  useInput11((_input, key) => {
+  useInput13((_input, key) => {
     if (key.return) {
       void finishDebugRun({
         outputs: upgradeCheck ?? {},
@@ -6328,12 +6068,12 @@ function UpgradeScreen({ onDone }) {
       return;
     }
   });
-  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx12(Text12, { bold: true, children: "Upgrade" }),
-    /* @__PURE__ */ jsx12(Text12, { children: " " }),
+  return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx16(Text15, { bold: true, children: "Upgrade" }),
+    /* @__PURE__ */ jsx16(Text15, { children: " " }),
     renderBody(upgradeCheck),
-    /* @__PURE__ */ jsx12(Text12, { children: " " }),
-    /* @__PURE__ */ jsxs11(Text12, { bold: true, color: PALETTE.accent, children: [
+    /* @__PURE__ */ jsx16(Text15, { children: " " }),
+    /* @__PURE__ */ jsxs14(Text15, { bold: true, color: PALETTE.accent, children: [
       FOCUS_MARKER,
       " Go Back"
     ] })
@@ -6341,34 +6081,34 @@ function UpgradeScreen({ onDone }) {
 }
 function renderBody(upgradeCheck) {
   if (!upgradeCheck) {
-    return /* @__PURE__ */ jsx12(Text12, { color: PALETTE.muted, children: "Checking for updates\u2026" });
+    return /* @__PURE__ */ jsx16(Text15, { color: PALETTE.muted, children: "Checking for updates\u2026" });
   }
   if (upgradeCheck.status === "error") {
-    return /* @__PURE__ */ jsx12(Text12, { color: PALETTE.warning, children: "Couldn't check for updates \u2014 check your network connection and try again." });
+    return /* @__PURE__ */ jsx16(Text15, { color: PALETTE.warning, children: "Couldn't check for updates \u2014 check your network connection and try again." });
   }
   if (upgradeCheck.status === "up-to-date") {
-    return /* @__PURE__ */ jsxs11(Text12, { color: PALETTE.success, children: [
+    return /* @__PURE__ */ jsxs14(Text15, { color: PALETTE.success, children: [
       "You're already on the latest version (v",
       upgradeCheck.current,
       ")."
     ] });
   }
-  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs11(Text12, { color: PALETTE.muted, children: [
-      /* @__PURE__ */ jsxs11(Text12, { bold: true, color: PALETTE.success, children: [
+  return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs14(Text15, { color: PALETTE.muted, children: [
+      /* @__PURE__ */ jsxs14(Text15, { bold: true, color: PALETTE.success, children: [
         "v",
         upgradeCheck.latest
       ] }),
       " ",
       "is available (you're on ",
-      /* @__PURE__ */ jsxs11(Text12, { bold: true, children: [
+      /* @__PURE__ */ jsxs14(Text15, { bold: true, children: [
         "v",
         upgradeCheck.current
       ] }),
       "). Exit this program, cd into the root of your local clone of contentful/experience-design-system-sdk-public, then run:"
     ] }),
-    /* @__PURE__ */ jsx12(Text12, { children: " " }),
-    /* @__PURE__ */ jsx12(Box11, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.border, paddingX: 1, children: UPGRADE_COMMANDS.map((cmd) => /* @__PURE__ */ jsx12(Text12, { bold: true, children: cmd }, cmd)) })
+    /* @__PURE__ */ jsx16(Text15, { children: " " }),
+    /* @__PURE__ */ jsx16(Box14, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.border, paddingX: 1, children: UPGRADE_COMMANDS.map((cmd) => /* @__PURE__ */ jsx16(Text15, { bold: true, children: cmd }, cmd)) })
   ] });
 }
 var UPGRADE_COMMANDS;
@@ -6383,13 +6123,13 @@ var init_PageContainer4 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
-import { useEffect as useEffect8, useState as useState12 } from "react";
-import { Box as Box12, Text as Text13, useInput as useInput12 } from "ink";
-import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+import { useEffect as useEffect9, useState as useState13 } from "react";
+import { Box as Box15, Text as Text16, useInput as useInput14 } from "ink";
+import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 function DebugModeScreen({ onDone }) {
-  const [loading, setLoading] = useState12(true);
-  const [enabled, setEnabled] = useState12(true);
-  useEffect8(() => {
+  const [loading, setLoading] = useState13(true);
+  const [enabled, setEnabled] = useState13(true);
+  useEffect9(() => {
     readDebugModeSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -6401,7 +6141,7 @@ function DebugModeScreen({ onDone }) {
       });
     });
   }, []);
-  useInput12((input, key) => {
+  useInput14((input, key) => {
     if (loading) return;
     if (key.return || input === " ") {
       setEnabled((current) => {
@@ -6416,16 +6156,16 @@ function DebugModeScreen({ onDone }) {
       onDone();
     }
   });
-  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx13(Text13, { bold: true, children: "Settings \u203A Debug Mode" }),
-    /* @__PURE__ */ jsx13(Text13, { children: " " }),
-    loading ? /* @__PURE__ */ jsx13(Text13, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs12(Text13, { children: [
+  return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx17(Text16, { bold: true, children: "Settings \u203A Debug Mode" }),
+    /* @__PURE__ */ jsx17(Text16, { children: " " }),
+    loading ? /* @__PURE__ */ jsx17(Text16, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs15(Text16, { children: [
       "Debug logging:",
       " ",
-      /* @__PURE__ */ jsx13(Text13, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
+      /* @__PURE__ */ jsx17(Text16, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
     ] }),
-    /* @__PURE__ */ jsx13(Text13, { children: " " }),
-    /* @__PURE__ */ jsx13(
+    /* @__PURE__ */ jsx17(Text16, { children: " " }),
+    /* @__PURE__ */ jsx17(
       ControlHints,
       {
         hints: [
@@ -6436,7 +6176,7 @@ function DebugModeScreen({ onDone }) {
     )
   ] });
 }
-var init_screen6 = __esm({
+var init_screen7 = __esm({
   "packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx"() {
     "use strict";
     init_home_theme();
@@ -6451,17 +6191,19 @@ var app_exports = {};
 __export(app_exports, {
   runApp: () => runApp
 });
-import { useEffect as useEffect9, useState as useState13 } from "react";
-import { Fragment as Fragment5, jsx as jsx14 } from "react/jsx-runtime";
-function App({ onLaunchImport, importExitCode }) {
+import { join as join8 } from "node:path";
+import { useEffect as useEffect10, useState as useState14 } from "react";
+import { Fragment as Fragment5, jsx as jsx18 } from "react/jsx-runtime";
+function App({ importOptions, onLaunchImport, importExitCode }) {
   const returnedFromImport = importExitCode !== void 0;
-  const [screen, setScreen] = useState13(returnedFromImport ? "import" : "start");
-  const [showImportResult, setShowImportResult] = useState13(returnedFromImport);
-  const [projectPath, setProjectPath] = useState13();
-  const [tokensPath, setTokensPath] = useState13();
-  const [scannedFiles, setScannedFiles] = useState13();
-  const [importDefaults, setImportDefaults] = useState13();
-  useEffect9(() => {
+  const [screen, setScreen] = useState14(returnedFromImport ? "import" : "start");
+  const [showImportResult, setShowImportResult] = useState14(returnedFromImport);
+  const [projectPath, setProjectPath] = useState14();
+  const [tokensPath, setTokensPath] = useState14();
+  const [scannedFiles, setScannedFiles] = useState14();
+  const [pendingLaunch, setPendingLaunch] = useState14();
+  const [importDefaults, setImportDefaults] = useState14();
+  useEffect10(() => {
     if (screen !== "import") {
       setImportDefaults(void 0);
       return;
@@ -6476,7 +6218,27 @@ function App({ onLaunchImport, importExitCode }) {
   }, [screen]);
   const finishCredentials = async (result, projectPath2, tokens, filePaths) => {
     if (!result.skipped) await writeCredentials({ ...result.credentials });
-    onLaunchImport?.({ projectPath: projectPath2, tokens, filePaths, skipCredentials: result.skipped });
+    const launch = {
+      projectPath: projectPath2,
+      tokens,
+      filePaths,
+      skipCredentials: result.skipped,
+      ...importOptions
+    };
+    const state = await inspectTokens({
+      rawTokensPath: tokens,
+      outDir: join8(resolveUserPath(projectPath2), ".contentful"),
+      cache: importOptions.cache
+    });
+    if (state.kind === "cached") {
+      setPendingLaunch({ launch, cached: { tokensPath: state.tokensPath, sourceChanged: state.sourceChanged } });
+      return;
+    }
+    onLaunchImport?.({ ...launch, tokenStrategy: "generate" });
+  };
+  const chooseTokenStrategy = (pending, tokenStrategy) => {
+    setPendingLaunch(void 0);
+    onLaunchImport?.({ ...pending.launch, tokenStrategy });
   };
   const goToStart = () => setScreen("start");
   const goToSettings = () => setScreen("settings");
@@ -6484,6 +6246,7 @@ function App({ onLaunchImport, importExitCode }) {
     setProjectPath(void 0);
     setTokensPath(void 0);
     setScannedFiles(void 0);
+    setPendingLaunch(void 0);
   };
   const finishImportResult = () => {
     setShowImportResult(false);
@@ -6496,13 +6259,13 @@ function App({ onLaunchImport, importExitCode }) {
   };
   switch (screen) {
     case "import":
-      if (showImportResult) return /* @__PURE__ */ jsx14(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
-      if (importDefaults === void 0) return /* @__PURE__ */ jsx14(Fragment5, {});
+      if (showImportResult) return /* @__PURE__ */ jsx18(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
+      if (importDefaults === void 0) return /* @__PURE__ */ jsx18(Fragment5, {});
       if (projectPath === void 0) {
-        return /* @__PURE__ */ jsx14(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
+        return /* @__PURE__ */ jsx18(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
       }
       if (tokensPath === void 0) {
-        return /* @__PURE__ */ jsx14(
+        return /* @__PURE__ */ jsx18(
           TokenInputScreen,
           {
             initialPath: importDefaults.tokenFile,
@@ -6512,7 +6275,7 @@ function App({ onLaunchImport, importExitCode }) {
         );
       }
       if (scannedFiles === void 0) {
-        return /* @__PURE__ */ jsx14(
+        return /* @__PURE__ */ jsx18(
           PathValidationScreen,
           {
             projectPath,
@@ -6522,7 +6285,19 @@ function App({ onLaunchImport, importExitCode }) {
           }
         );
       }
-      return /* @__PURE__ */ jsx14(
+      if (pendingLaunch?.cached) {
+        return /* @__PURE__ */ jsx18(
+          TokenReuseScreen,
+          {
+            tokensPath: pendingLaunch.cached.tokensPath,
+            sourceChanged: pendingLaunch.cached.sourceChanged,
+            onReuse: () => chooseTokenStrategy(pendingLaunch, "reuse"),
+            onRegenerate: () => chooseTokenStrategy(pendingLaunch, "regenerate"),
+            onQuit: leaveImport
+          }
+        );
+      }
+      return /* @__PURE__ */ jsx18(
         CredentialsScreen,
         {
           initial: importDefaults.credentials,
@@ -6531,27 +6306,28 @@ function App({ onLaunchImport, importExitCode }) {
         }
       );
     case "help":
-      return /* @__PURE__ */ jsx14(HelpScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx18(HelpScreen, { onDone: goToStart });
     case "upgrade":
-      return /* @__PURE__ */ jsx14(UpgradeScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx18(UpgradeScreen, { onDone: goToStart });
     case "settings":
-      return /* @__PURE__ */ jsx14(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
+      return /* @__PURE__ */ jsx18(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
     case "settings-configuration":
-      return /* @__PURE__ */ jsx14(ConfigurationScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx18(ConfigurationScreen, { onDone: goToSettings });
     case "settings-opt-in-analytics":
-      return /* @__PURE__ */ jsx14(OptInAnalyticsScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx18(OptInAnalyticsScreen, { onDone: goToSettings });
     case "settings-debug-mode":
-      return /* @__PURE__ */ jsx14(DebugModeScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx18(DebugModeScreen, { onDone: goToSettings });
     case "start":
-      return /* @__PURE__ */ jsx14(HomeScreen, { onNavigate: setScreen });
+      return /* @__PURE__ */ jsx18(HomeScreen, { onNavigate: setScreen });
   }
 }
-async function renderUntilImportRequestedOrExit(renderApp, importExitCode) {
+async function renderUntilImportRequestedOrExit(renderApp, importOptions, importExitCode) {
   let requestedImport;
   const instance = renderApp(
-    /* @__PURE__ */ jsx14(
+    /* @__PURE__ */ jsx18(
       App,
       {
+        importOptions,
         importExitCode,
         onLaunchImport: (options) => {
           requestedImport = options;
@@ -6567,13 +6343,13 @@ async function renderUntilImportRequestedOrExit(renderApp, importExitCode) {
   }
   return requestedImport;
 }
-async function runApp(renderApp) {
+async function runApp(renderApp, importOptions) {
   let importExitCode;
-  let requestedImport = await renderUntilImportRequestedOrExit(renderApp, importExitCode);
+  let requestedImport = await renderUntilImportRequestedOrExit(renderApp, importOptions, importExitCode);
   while (requestedImport !== void 0) {
     importExitCode = (await spawnV1Import(requestedImport)).exitCode;
     startReadingTerminal();
-    requestedImport = await renderUntilImportRequestedOrExit(renderApp, importExitCode);
+    requestedImport = await renderUntilImportRequestedOrExit(renderApp, importOptions, importExitCode);
   }
 }
 var CLEAR_SCREEN;
@@ -6583,14 +6359,16 @@ var init_app = __esm({
     init_home();
     init_PageContainer();
     init_steps();
+    init_logic8();
+    init_resolve_user_path();
     init_spawn_v1_import();
     init_terminal_input();
     init_PageContainer2();
     init_PageContainer3();
     init_ContentfulConfigScreen();
-    init_screen5();
-    init_PageContainer4();
     init_screen6();
+    init_PageContainer4();
+    init_screen7();
     init_config_store();
     CLEAR_SCREEN = "\x1B[2J\x1B[H";
   }
@@ -6598,7 +6376,7 @@ var init_app = __esm({
 
 // packages/experience-design-system-cli/program.ts
 import { readFileSync as readFileSync4 } from "node:fs";
-import { join as join7 } from "node:path";
+import { join as join9 } from "node:path";
 import { Command } from "commander";
 
 // packages/experience-design-system-cli/src/legacy/run-legacy.ts
@@ -6657,6 +6435,9 @@ function forwardedImportArgs(argv) {
   return argv[0] === "import" ? argv.slice(1) : argv;
 }
 
+// packages/experience-design-system-cli/src/commands/import.ts
+init_import_options();
+
 // packages/experience-design-system-cli/src/commands/watch.ts
 init_package_root();
 import { spawn as spawn2 } from "node:child_process";
@@ -6687,12 +6468,17 @@ function runDevWatch(args) {
 
 // packages/experience-design-system-cli/src/commands/import.ts
 function registerImportCommand(program, openTui) {
-  program.command("import", { isDefault: true }).description("Launch the Experiences CLI").allowUnknownOption().allowExcessArguments().helpOption(false).argument("[args...]").action(async () => {
+  program.command("import", { isDefault: true }).description("Launch the Experiences CLI").allowUnknownOption().allowExcessArguments().helpOption(false).argument("[args...]").option("--agent <name>", "Agent (or agent:model) the import runs its steps with").option(
+    "--prompt <stage=value>",
+    "Override a stage prompt (repeatable): a file path or literal text, e.g. --prompt select=./p.md",
+    (value, previous) => [...previous, value],
+    []
+  ).option("--no-cache", "Re-run every step even if its output already exists").action(async (_args, raw) => {
     const { watch, rest: forwarded } = extractWatchFlag(forwardedImportArgs(process.argv.slice(2)));
     if (watch) {
       process.exit(await runDevWatch(forwarded));
     }
-    await openTui();
+    await openTui(toImportOptions(raw));
   });
 }
 
@@ -6700,16 +6486,16 @@ function registerImportCommand(program, openTui) {
 init_package_root();
 var pkg = JSON.parse(
   readFileSync4(
-    join7(findPackageRoot(import.meta.url, "@contentful/experience-design-system-cli"), "package.json"),
+    join9(findPackageRoot(import.meta.url, "@contentful/experience-design-system-cli"), "package.json"),
     "utf8"
   )
 );
 function createProgram() {
   const program = new Command().name("experiences").description("Contentful Experiences design system import CLI").version(pkg.version, "--version", "Print version number");
-  registerImportCommand(program, async () => {
+  registerImportCommand(program, async (options) => {
     const { render } = await import("ink");
     const { runApp: runApp2 } = await Promise.resolve().then(() => (init_app(), app_exports));
-    await runApp2(render);
+    await runApp2(render, options);
   });
   registerForwardedCommands(program);
   return program;
@@ -6720,7 +6506,7 @@ init_config();
 init_package_root();
 import { existsSync as existsSync5 } from "node:fs";
 import { mkdir as mkdir3, readFile as readFile2, rename as rename2, rmdir, unlink } from "node:fs/promises";
-import { dirname as dirname3, join as join8 } from "node:path";
+import { dirname as dirname3, join as join10 } from "node:path";
 var PACKAGE_NAME4 = "@contentful/experience-design-system-cli";
 async function readJson(path5) {
   try {
@@ -6731,9 +6517,9 @@ async function readJson(path5) {
 }
 async function migrateOldConfig() {
   try {
-    const oldCredentials = join8(oldConfigDir2(), "credentials.json");
-    const oldRuns = join8(oldConfigDir2(), "runs.json");
-    const oldDebugMode = join8(
+    const oldCredentials = join10(oldConfigDir2(), "credentials.json");
+    const oldRuns = join10(oldConfigDir2(), "runs.json");
+    const oldDebugMode = join10(
       findPackageRoot(import.meta.url, PACKAGE_NAME4),
       ".contentful",
       "config",