@contentful/experience-design-system-cli 2.32.1-dev-build-6b922ec.0 → 2.32.1-dev-build-b7d2d34.0

package/dist/src/index.js

@@ -297,10 +297,10 @@ function codexBedrockConfigArgs() {
   const region = process.env.AWS_REGION?.trim() || process.env.AWS_DEFAULT_REGION?.trim() || DEFAULT_CODEX_BEDROCK_REGION;
   return ["-c", "model_provider=amazon-bedrock", "-c", `model_providers.amazon-bedrock.region=${region}`];
 }
-function buildArgs(agent, prompt, model, promptViaStdin = false, bedrock = false) {
+function buildArgs(agent, prompt2, model, promptViaStdin = false, bedrock = false) {
   const resolvedModel = resolveAgentModel(agent, model, bedrock);
   const modelArg = resolvedModel ? ["--model", resolvedModel] : [];
-  const promptArg = promptViaStdin ? [] : [prompt];
+  const promptArg = promptViaStdin ? [] : [prompt2];
   switch (agent) {
     case "claude":
       return ["--print", ...modelArg, ...promptArg];
@@ -320,11 +320,11 @@ function buildArgs(agent, prompt, model, promptViaStdin = false, bedrock = false
   }
 }
 async function runAgent(options) {
-  const { agent, prompt, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
+  const { agent, prompt: prompt2, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
   const bedrock = options.bedrock ?? process.env.EDS_BEDROCK === "1";
   const binary = resolveBinary(agent);
-  const useStdin3 = !!promptViaStdin;
-  const args = buildArgs(agent, prompt, model, useStdin3, bedrock);
+  const useStdin2 = !!promptViaStdin;
+  const args = buildArgs(agent, prompt2, model, useStdin2, bedrock);
   const startedAt = Date.now();
   onDebugEvent?.("run.start", {
     agent,
@@ -332,19 +332,19 @@ async function runAgent(options) {
     model,
     bedrock: !!bedrock,
     timeoutMs,
-    promptLen: prompt.length,
-    promptHead: prompt.slice(0, 500)
+    promptLen: prompt2.length,
+    promptHead: prompt2.slice(0, 500)
   });
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
       stdio: ["pipe", "pipe", "pipe"],
       ...bedrockEnv ? { env: { ...process.env, ...bedrockEnv } } : {}
     });
-    if (useStdin3 && child.stdin) {
+    if (useStdin2 && child.stdin) {
       child.stdin.on("error", () => {
       });
-      child.stdin.write(prompt, () => {
+      child.stdin.write(prompt2, () => {
         child.stdin?.end();
       });
     } else {
@@ -384,25 +384,25 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve27(result);
+      resolve28(result);
     });
   });
 }
 async function checkAgentAuth(agent) {
   const binary = resolveBinary(agent);
-  const binaryExists2 = await new Promise((resolve27) => {
+  const binaryExists2 = await new Promise((resolve28) => {
     if (binary.startsWith("/")) {
-      import("node:fs/promises").then((fs2) => fs2.access(binary).then(() => resolve27(true), () => resolve27(false)));
+      import("node:fs/promises").then((fs2) => fs2.access(binary).then(() => resolve28(true), () => resolve28(false)));
       return;
     }
     const child = spawn("which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve27(code === 0));
+    child.on("close", (code) => resolve28(code === 0));
   });
   if (!binaryExists2)
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     const child = spawn(binary, ["auth", "status", "--json"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -412,7 +412,7 @@ async function checkAgentAuth(agent) {
       if (!done) {
         done = true;
         child.kill("SIGTERM");
-        resolve27("unauthenticated");
+        resolve28("unauthenticated");
       }
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
@@ -424,14 +424,14 @@ async function checkAgentAuth(agent) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve27("unauthenticated");
+        resolve28("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve27(status.loggedIn ? "ok" : "unauthenticated");
+        resolve28(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve27("unauthenticated");
+        resolve28("unauthenticated");
       }
     });
   });
@@ -624,8 +624,20 @@ function renderTokenCandidateSection(kind, entries) {
 ${formatTokenCandidateLines(entries)}`;
 }
 function buildPreamble(options) {
-  const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs } = options;
+  const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs, existingComponentsInline, existingTokensInline } = options;
   const sections = [];
+  if (existingComponentsInline) {
+    sections.push(`Existing components in the target Contentful space (JSON) \u2014 use for alignment, not as a hard filter:
+\`\`\`json
+${existingComponentsInline}
+\`\`\``);
+  }
+  if (existingTokensInline) {
+    sections.push(`Existing design tokens in the target Contentful space (JSON) \u2014 prefer binding to these paths over inventing new ones:
+\`\`\`json
+${existingTokensInline}
+\`\`\``);
+  }
   if (rawComponentsInline) {
     sections.push(`Raw component data (JSON):
 \`\`\`json
@@ -8775,9 +8787,10 @@ async function hashFile(filePath) {
   const content = await readFile6(filePath, "utf8");
   return hashContent(content);
 }
-async function hashPromptForSkill(skill, agent, model, skillPathOverride) {
+async function hashPromptForSkill(skill, agent, model, skillPathOverride, extraInputs = []) {
   const promptHash = skillPathOverride ? await hashFile(resolve6(skillPathOverride)) : await hashFile(resolveSkillPath(skill));
-  return hashContent(`${promptHash}|${agent}|${model ?? ""}`);
+  const extraSegment = extraInputs.length > 0 ? `|${extraInputs.join("|")}` : "";
+  return hashContent(`${promptHash}|${agent}|${model ?? ""}${extraSegment}`);
 }
 var init_cache_keys = __esm({
   "packages/experience-design-system-cli/src/session/cache-keys.ts"() {
@@ -12885,7 +12898,7 @@ var init_user_agent = __esm({
 
 // packages/experience-design-system-cli/src/apply/api-client.ts
 function defaultSleep(delayMs) {
-  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
+  return new Promise((resolve28) => setTimeout(resolve28, delayMs));
 }
 function isTransientStatus(status) {
   return status >= 500 && status <= 599;
@@ -13273,7 +13286,7 @@ ${trimmed}`;
             const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
             const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
             const jitter = Math.random() * baseDelay * 0.15;
-            await new Promise((resolve27) => setTimeout(resolve27, baseDelay + jitter));
+            await new Promise((resolve28) => setTimeout(resolve28, baseDelay + jitter));
           }
         }
         throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -13370,10 +13383,10 @@ function parseJsonBody(body) {
   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 pick2 = (k) => p[k] !== void 0 ? p[k] : details[k];
+  const codeRaw = pick2("code") ?? asRecord(p.sys)?.id;
+  const messageRaw = pick2("message");
+  const cycleRaw = pick2("cycle");
   const out = {};
   if (typeof codeRaw === "string") out.code = codeRaw;
   if (typeof messageRaw === "string") out.message = messageRaw;
@@ -16565,7 +16578,7 @@ var init_command2 = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/path-utils.ts
-import { resolve as resolve20 } from "node:path";
+import { resolve as resolve21 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 function expandTilde(input) {
   if (input === "~" || input.startsWith("~/") || input.startsWith("~\\")) {
@@ -16579,7 +16592,7 @@ function normalizePath(input) {
     p = p.slice(1, -1);
   }
   p = expandTilde(p);
-  return resolve20(p);
+  return resolve21(p);
 }
 var init_path_utils = __esm({
   "packages/experience-design-system-cli/src/import/path-utils.ts"() {
@@ -16587,9 +16600,74 @@ var init_path_utils = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/helpers/build-contentful-management-client.ts
+import { createClient as createClient2 } from "contentful-management";
+function buildContentfulManagementClient(opts) {
+  return createClient2(
+    {
+      accessToken: opts.cmaToken,
+      ...opts.host ? { host: toConfiguredHost(opts.host) } : {}
+    },
+    { type: "plain" }
+  );
+}
+var init_build_contentful_management_client = __esm({
+  "packages/experience-design-system-cli/src/helpers/build-contentful-management-client.ts"() {
+    "use strict";
+    init_host_utils();
+  }
+});
+
+// packages/experience-design-system-cli/src/helpers/fetch-existing-contentful-entities.ts
+import { fetchAll } from "contentful-management";
+async function fetchExistingContentfulEntitiesFromContentful(client2, params) {
+  const scope = { spaceId: params.spaceId, environmentId: params.environmentId, query: {} };
+  const components = await fetchAll(client2.component.getMany, scope);
+  const tokens = await fetchAll(client2.designToken.getMany, scope);
+  return { components, tokens };
+}
+var init_fetch_existing_contentful_entities = __esm({
+  "packages/experience-design-system-cli/src/helpers/fetch-existing-contentful-entities.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/helpers/fetch-and-persist-existing-contentful-entities.ts
+import { writeFile as writeFile5 } from "node:fs/promises";
+import { join as join18 } from "node:path";
+async function fetchAndPersistExistingContentfulEntities(params) {
+  const t0 = Date.now();
+  try {
+    const client2 = buildContentfulManagementClient({
+      cmaToken: params.cmaToken,
+      ...params.host ? { host: params.host } : {}
+    });
+    const entities = await fetchExistingContentfulEntitiesFromContentful(client2, {
+      spaceId: params.spaceId,
+      environmentId: params.environmentId
+    });
+    const path = join18(params.outDir, ".existing-entities.json");
+    await writeFile5(path, JSON.stringify(entities, null, 2), "utf8");
+    return { ok: true, path, durationMs: Date.now() - t0, entities };
+  } catch (error) {
+    return {
+      ok: false,
+      durationMs: Date.now() - t0,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+var init_fetch_and_persist_existing_contentful_entities = __esm({
+  "packages/experience-design-system-cli/src/helpers/fetch-and-persist-existing-contentful-entities.ts"() {
+    "use strict";
+    init_build_contentful_management_client();
+    init_fetch_existing_contentful_entities();
+  }
+});
+
 // packages/experience-design-system-cli/src/runs/save-path-resolver.ts
 import { access as access8 } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 function isConflictMode(value) {
   return CONFLICT_MODES.includes(value);
 }
@@ -16597,7 +16675,7 @@ async function listConflictingFiles(path) {
   const conflicts = [];
   for (const name of SAVE_FILES) {
     try {
-      await access8(join19(path, name));
+      await access8(join20(path, name));
       conflicts.push(name);
     } catch {
     }
@@ -16617,7 +16695,7 @@ function buildTimestampedSubdir(base, now = /* @__PURE__ */ new Date()) {
   const hh = pad2(now.getHours());
   const mm = pad2(now.getMinutes());
   const ss = pad2(now.getSeconds());
-  return join19(base, `dsi-${y}${m}${d}-${hh}${mm}${ss}`);
+  return join20(base, `dsi-${y}${m}${d}-${hh}${mm}${ss}`);
 }
 async function resolveSavePath(path, options = {}) {
   const conflicts = await listConflictingFiles(path);
@@ -16647,8 +16725,8 @@ var init_save_path_resolver = __esm({
 });
 
 // packages/experience-design-system-cli/src/runs/store.ts
-import { readFile as readFile22, writeFile as writeFile6, mkdir as mkdir6, rename } from "node:fs/promises";
-import { join as join20 } from "node:path";
+import { readFile as readFile23, writeFile as writeFile6, mkdir as mkdir6, rename } from "node:fs/promises";
+import { join as join21 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 import { randomBytes as randomBytes2 } from "node:crypto";
 function runsFilePath() {
@@ -16691,7 +16769,7 @@ function migrateRecord(rec) {
 }
 async function readFileMaybe() {
   try {
-    const raw = await readFile22(RUNS_PATH, "utf8");
+    const raw = await readFile23(RUNS_PATH, "utf8");
     const parsed = JSON.parse(raw);
     if (!READABLE_VERSIONS.has(parsed.version)) {
       throw new Error(
@@ -16769,8 +16847,8 @@ var init_store = __esm({
     RUNS_FILE_VERSION = 3;
     RUNS_FILE_CAP = 200;
     READABLE_VERSIONS = /* @__PURE__ */ new Set([1, 2, 3]);
-    RUNS_DIR = join20(homedir7(), ".config", "experiences");
-    RUNS_PATH = join20(RUNS_DIR, "runs.json");
+    RUNS_DIR = join21(homedir7(), ".config", "experiences");
+    RUNS_PATH = join21(RUNS_DIR, "runs.json");
     CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
   }
 });
@@ -16834,7 +16912,7 @@ var init_run_teaser = __esm({
 import { useState as useState9, useEffect as useEffect3 } from "react";
 import { Box as Box20, Text as Text20 } from "ink";
 import { readdirSync as readdirSync3 } from "node:fs";
-import { dirname as dirname13, basename as basename6, join as join21 } from "node:path";
+import { dirname as dirname13, basename as basename6, join as join22 } from "node:path";
 import { jsx as jsx20, jsxs as jsxs20 } from "react/jsx-runtime";
 function autocomplete(partial) {
   if (!partial) return null;
@@ -16849,13 +16927,13 @@ function autocomplete(partial) {
   }
   const matches = entries.filter((e) => e.startsWith(base));
   if (matches.length === 0) return null;
-  if (matches.length === 1) return join21(dir, matches[0]);
+  if (matches.length === 1) return join22(dir, matches[0]);
   let prefix = matches[0];
   for (const m of matches) {
     while (!m.startsWith(prefix)) prefix = prefix.slice(0, -1);
     if (!prefix) break;
   }
-  return prefix.length > base.length ? join21(dir, prefix) : null;
+  return prefix.length > base.length ? join22(dir, prefix) : null;
 }
 function PathPrompt({
   defaultPath,
@@ -17287,8 +17365,8 @@ var init_save_conflict = __esm({
 
 // packages/experience-design-system-cli/src/runs/fingerprint.ts
 import { createHash as createHash4 } from "node:crypto";
-import { readFile as readFile23, stat as stat5 } from "node:fs/promises";
-import { resolve as resolve22 } from "node:path";
+import { readFile as readFile24, stat as stat5 } from "node:fs/promises";
+import { resolve as resolve23 } from "node:path";
 function rowField(row, key) {
   const v = row[key];
   return typeof v === "string" ? v : null;
@@ -17304,7 +17382,7 @@ async function buildSourceFingerprint(opts) {
     const sourcePath = rowField(row, "source_path");
     const name = rowField(row, "name");
     if (!sourcePath) continue;
-    const abs = resolve22(sourcePath);
+    const abs = resolve23(sourcePath);
     if (seen.has(abs)) continue;
     seen.add(abs);
     try {
@@ -17319,10 +17397,10 @@ async function buildSourceFingerprint(opts) {
   let rawTokensMtime = null;
   let rawTokensContentHash = null;
   if (opts.rawTokensPath) {
-    const abs = resolve22(opts.rawTokensPath);
+    const abs = resolve23(opts.rawTokensPath);
     rawTokensPath = abs;
     try {
-      const [st, buf] = await Promise.all([stat5(abs), readFile23(abs)]);
+      const [st, buf] = await Promise.all([stat5(abs), readFile24(abs)]);
       rawTokensMtime = st.mtime.toISOString();
       rawTokensContentHash = sha256Hex(buf);
     } catch {
@@ -17453,7 +17531,7 @@ var init_WelcomeStep = __esm({
 import { useState as useState13, useEffect as useEffect5 } from "react";
 import { Box as Box25, Text as Text25 } from "ink";
 import { promises as fs } from "node:fs";
-import { join as join22 } from "node:path";
+import { join as join23 } from "node:path";
 import { jsx as jsx25, jsxs as jsxs25 } from "react/jsx-runtime";
 async function countFiles(dir) {
   const counts = {
@@ -17477,7 +17555,7 @@ async function countFiles(dir) {
     await Promise.all(
       entries.map(async (entry) => {
         if (IGNORE_DIRS.has(entry)) return;
-        const full = join22(current, entry);
+        const full = join23(current, entry);
         let stat8;
         try {
           stat8 = await fs.stat(full);
@@ -17935,8 +18013,11 @@ function CredentialsStep({
       "\u2713 ",
       summary
     ] }),
-    /* @__PURE__ */ jsx28(Box28, { marginTop: 1, children: /* @__PURE__ */ jsx28(Text28, { children: initialSpaceId && initialCmaToken ? "Credentials pre-filled from experiences setup. Press Enter to continue or edit any field to update." : "Enter your Contentful credentials to continue." }) }),
-    !(initialSpaceId && initialCmaToken) && /* @__PURE__ */ jsx28(Text28, { dimColor: true, children: "Tip: run experiences setup to save these to ~/.config/experiences/credentials.json so they pre-fill here automatically." }),
+    /* @__PURE__ */ jsxs28(Box28, { flexDirection: "column", marginTop: 1, gap: 0, children: [
+      /* @__PURE__ */ jsx28(Text28, { children: initialSpaceId && initialCmaToken ? "Credentials pre-filled from experiences setup. Press Enter to continue or edit any field to update." : "Enter the Contentful space you want to import into." }),
+      !(initialSpaceId && initialCmaToken) && /* @__PURE__ */ jsx28(Text28, { dimColor: true, children: "These credentials are used both to align agent suggestions with what already exists in the space and to push your import at the end. Press S to skip and run without space context (push will be disabled)." }),
+      !(initialSpaceId && initialCmaToken) && /* @__PURE__ */ jsx28(Text28, { dimColor: true, children: "Tip: run experiences setup to save these to ~/.config/experiences/credentials.json so they pre-fill here automatically." })
+    ] }),
     /* @__PURE__ */ jsxs28(Box28, { flexDirection: "column", gap: 0, marginTop: 1, children: [
       renderField("Space ID", spaceId, "spaceId"),
       renderField("Environment", environmentId, "environmentId"),
@@ -19103,9 +19184,9 @@ function spawnGenerateChild(opts) {
     stderr += chunk;
     opts.onStderr?.(chunk);
   });
-  const donePromise = new Promise((resolve27) => {
+  const donePromise = new Promise((resolve28) => {
     child.on("close", (code, signal) => {
-      resolve27({
+      resolve28({
         exitCode: code ?? 0,
         signal: signal ?? null,
         stdout,
@@ -19113,7 +19194,7 @@ function spawnGenerateChild(opts) {
       });
     });
     child.on("error", (err) => {
-      resolve27({
+      resolve28({
         exitCode: 1,
         signal: null,
         stdout,
@@ -27656,9 +27737,9 @@ __export(WizardApp_exports, {
 });
 import { useEffect as useEffect15, useRef as useRef9, useState as useState28 } from "react";
 import { Box as Box49, Text as Text51, useStdout as useStdout8 } from "ink";
-import { join as join23, resolve as resolve23 } from "node:path";
+import { join as join24, resolve as resolve24 } from "node:path";
 import { appendFileSync as appendFileSync2, writeFileSync } from "node:fs";
-import { access as access9, readFile as readFile24, stat as stat6 } from "node:fs/promises";
+import { access as access9, readFile as readFile25, stat as stat6 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { execFile as execFile4, spawn as spawn4 } from "node:child_process";
 import { mkdir as mkdir7 } from "node:fs/promises";
@@ -27670,6 +27751,7 @@ function buildSelectAgentArgs(opts) {
   if (opts.bedrock) args.push("--bedrock");
   if (opts.selectPromptPath) args.push("--select-prompt-path", opts.selectPromptPath);
   if (opts.noCache) args.push("--no-cache");
+  if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
 function parseAutoFilterProgressLine(line) {
@@ -27706,6 +27788,7 @@ function buildGenerateComponentsArgs(opts) {
   if (opts.bedrock) args.push("--bedrock");
   if (opts.noCache) args.push("--no-cache");
   if (opts.generatePromptPath) args.push("--generate-prompt-path", opts.generatePromptPath);
+  if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
 function buildMapTokensArgs(opts) {
@@ -27713,6 +27796,7 @@ function buildMapTokensArgs(opts) {
   if (opts.model) args.push("--model", opts.model);
   if (opts.noCache) args.push("--no-cache");
   if (opts.skipAgent) args.push("--skip-agent");
+  if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
 function shouldRunMapTokens(opts) {
@@ -27802,8 +27886,8 @@ function WizardApp({
   const rawTokensEntryReady = !modifyEntryReady && !pushFromPickerReady && !!initialRawTokensPath;
   const effectiveNoCache = resolveNoCacheForGenerate({ cliNoCache: noCache });
   const initialStepResolved = modifyEntryReady ? "final-review" : pushFromPickerReady ? "push-from-picker" : rawTokensEntryReady ? "generating-tokens" : initialProjectPath ? "token-input" : "welcome";
-  const initialOutDir = initialProjectPath ? join23(resolve23(initialProjectPath), ".contentful") : "";
-  const initialTokensPath = (modifyEntryReady || pushFromPickerReady) && initialOutDir && seedTokenSessionId ? join23(initialOutDir, "tokens.json") : "";
+  const initialOutDir = initialProjectPath ? join24(resolve24(initialProjectPath), ".contentful") : "";
+  const initialTokensPath = (modifyEntryReady || pushFromPickerReady) && initialOutDir && seedTokenSessionId ? join24(initialOutDir, "tokens.json") : "";
   const [state, setState] = useState28({
     step: modifyEntryReady || rawTokensEntryReady || pushFromPickerReady ? initialStepResolved : initialRuns && initialRuns.length > 0 ? "run-picker" : initialStepResolved,
     agent: initialAgent ?? "claude",
@@ -27856,6 +27940,7 @@ function WizardApp({
     generatePrefetchError: null,
     mapTokensEligible: null,
     credentialsSkipped: false,
+    existingEntitiesPath: null,
     lastRunId: null,
     finalizeErrorBanner: null,
     finalReviewPassed: modifyEntryReady || pushFromPickerReady,
@@ -27970,7 +28055,7 @@ If you are using AWS Bedrock, run:
     }
     const sessionMatch = /^session=(.+)$/m.exec(result.stdout);
     const tokenSessionId = sessionMatch ? sessionMatch[1].trim() : null;
-    const tokensPath = join23(outDir, "tokens.json");
+    const tokensPath = join24(outDir, "tokens.json");
     const printArgs = ["print", "tokens", "--out", tokensPath];
     if (tokenSessionId) printArgs.push("--session", tokenSessionId);
     const r = await runCli2(printArgs);
@@ -27990,7 +28075,7 @@ If you are using AWS Bedrock, run:
         tokenCount,
         skipComponents: true,
         acceptedCount: 0,
-        outDir: state.outDir || join23(process.cwd(), ".contentful")
+        outDir: state.outDir || join24(process.cwd(), ".contentful")
       });
       if (noPush) {
         void startSaveFlow();
@@ -28042,7 +28127,8 @@ If you are using AWS Bedrock, run:
       agent: state.agent,
       ...state.agentModel ? { model: state.agentModel } : {},
       noCache: effectiveNoCache,
-      skipAgent: skipMapTokens
+      skipAgent: skipMapTokens,
+      ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
     });
     const result = await runCli2(args);
     if (result.exitCode !== 0) {
@@ -28056,7 +28142,7 @@ If you are using AWS Bedrock, run:
     return true;
   };
   const runExtract = async (projectPath) => {
-    const outDir = join23(resolve23(projectPath), ".contentful");
+    const outDir = join24(resolve24(projectPath), ".contentful");
     update({ step: "extracting", outDir, extractProgress: null, compositionPhase: null });
     const r = await new Promise((res) => {
       const extractArgs = [findCliPath(), "analyze", "extract", "--project", projectPath];
@@ -28163,7 +28249,8 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         ...state.agentModel ? { model: state.agentModel } : {},
         ...state.bedrock ? { bedrock: true } : {},
         selectPromptPath,
-        noCache
+        noCache,
+        ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
       });
       const child = spawn4("node", [findCliPath(), ...args]);
       autoFilterChildRef.current = child;
@@ -28261,7 +28348,8 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
         ...state.bedrock ? { bedrock: true } : {},
-        noCache: effectiveNoCache
+        noCache: effectiveNoCache,
+        ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
       })
     ];
     let progressCursor = null;
@@ -28332,7 +28420,8 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         ...state.agentModel ? { model: state.agentModel } : {},
         ...state.bedrock ? { bedrock: true } : {},
         noCache: effectiveNoCache,
-        generatePromptPath
+        generatePromptPath,
+        ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
       })
     ];
     let progressCursor = state.generateProgress;
@@ -28372,7 +28461,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     if (await runMapTokens2(mappedSessionId)) update({ step: "final-review" });
   };
   const advanceToPushFlow = (generatedAcceptedCount) => {
-    update({ generatedAcceptedCount, step: "credentials" });
+    update({ generatedAcceptedCount, step: "push-decision-gate" });
   };
   const runEditFromPreview = async () => {
     update({ step: "final-review" });
@@ -28443,6 +28532,24 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     }
   };
   const advanceAfterCredentialsValidated = async () => {
+    if (!state.credentialsSkipped && state.spaceId && state.environmentId && state.cmaToken && state.projectPath) {
+      const outDir = join24(resolve24(state.projectPath), ".contentful");
+      await mkdir7(outDir, { recursive: true });
+      const result = await fetchAndPersistExistingContentfulEntities({
+        spaceId: state.spaceId,
+        environmentId: state.environmentId,
+        cmaToken: state.cmaToken,
+        ...state.host ? { host: state.host } : {},
+        outDir
+      });
+      if (result.ok) {
+        update({ existingEntitiesPath: result.path });
+      }
+    }
+    if (!sessionRef.current.extractSessionId && state.projectPath) {
+      void runExtract(state.projectPath);
+      return;
+    }
     if (shouldSkipFinalReviewAfterCredentials(state)) {
       update({ step: "push-decision-gate" });
       return;
@@ -28798,7 +28905,7 @@ If using a custom --host, make sure the space exists on that host.`
   };
   const runPrintFiles = async (extractSessionId, outDir, opts = {}) => {
     update({ step: "printing" });
-    const componentsPath = join23(outDir, "components.json");
+    const componentsPath = join24(outDir, "components.json");
     const printArgs = ["print", "components", "--out", componentsPath];
     if (extractSessionId) printArgs.push("--session", extractSessionId);
     if (opts.allowEmpty) printArgs.push("--allow-empty");
@@ -28814,7 +28921,7 @@ If using a custom --host, make sure the space exists on that host.`
     let emittedTokensPath;
     let emittedTokenCount;
     if (opts.tokenSessionId) {
-      const tokensOut = join23(outDir, "tokens.json");
+      const tokensOut = join24(outDir, "tokens.json");
       const tokenArgs = ["print", "tokens", "--out", tokensOut, "--session", opts.tokenSessionId];
       const tr = await runCli2(tokenArgs);
       if (tr.exitCode !== 0) {
@@ -28901,8 +29008,8 @@ If using a custom --host, make sure the space exists on that host.`
           );
         }
         try {
-          const componentsBuf = await readFile24(join23(path, "components.json")).catch(() => null);
-          const tokensBuf = recordedTokensPath ? await readFile24(recordedTokensPath).catch(() => null) : null;
+          const componentsBuf = await readFile25(join24(path, "components.json")).catch(() => null);
+          const tokensBuf = recordedTokensPath ? await readFile25(recordedTokensPath).catch(() => null) : null;
           savedFingerprint = buildSavedFingerprint({
             componentsJson: componentsBuf,
             tokensJson: tokensBuf
@@ -28943,7 +29050,7 @@ If using a custom --host, make sure the space exists on that host.`
     if (state.step === "generating-tokens") {
       if (tokenReuseChecked.current) return;
       tokenReuseChecked.current = true;
-      const existingTokensPath = join23(state.outDir, "tokens.json");
+      const existingTokensPath = join24(state.outDir, "tokens.json");
       (async () => {
         try {
           await access9(existingTokensPath);
@@ -29019,7 +29126,7 @@ If using a custom --host, make sure the space exists on that host.`
           {
             onContinue: (path) => {
               const projectPath = normalizePath(path);
-              const outDir = join23(projectPath, ".contentful");
+              const outDir = join24(projectPath, ".contentful");
               update({ step: "token-input", projectPath, outDir });
             },
             onQuit: () => process.exit(0)
@@ -29084,7 +29191,7 @@ If using a custom --host, make sure the space exists on that host.`
           {
             projectPath: state.projectPath,
             onConfirm: (path) => {
-              void runExtract(path);
+              update({ projectPath: path, step: "credentials" });
             },
             onSkipComponents: () => {
               if (noPush) {
@@ -29168,12 +29275,7 @@ If using a custom --host, make sure the space exists on that host.`
                     }
                     return;
                   }
-                  if (acceptedCount > 0 && !noPush) {
-                    if (await runAgentAuthCheck("credentials")) {
-                      startGeneratePrefetch(sid, state.tokensPath);
-                    }
-                  }
-                  update({ step: "credentials" });
+                  update({ step: "push-decision-gate" });
                 },
                 onAdvanceToPushFlow: (count) => {
                   update({ acceptedCount: count, autoRejectedCount: 0 });
@@ -29644,10 +29746,11 @@ var init_WizardApp = __esm({
     init_path_utils();
     init_host_utils();
     init_credentials_store();
+    init_fetch_and_persist_existing_contentful_entities();
     init_wizard_state_transitions();
     init_cycle_auto_reject();
     init_cli_path();
-    WIZARD_LOG = join23(tmpdir(), "experiences-import-wizard.log");
+    WIZARD_LOG = join24(tmpdir(), "experiences-import-wizard.log");
   }
 });
 
@@ -29658,8 +29761,8 @@ __export(staleness_exports, {
   formatStalenessDetail: () => formatStalenessDetail,
   shortStalenessSummary: () => shortStalenessSummary
 });
-import { readFile as readFile25, stat as stat7 } from "node:fs/promises";
-import { join as join24 } from "node:path";
+import { readFile as readFile26, stat as stat7 } from "node:fs/promises";
+import { join as join25 } from "node:path";
 async function checkRunStaleness(run) {
   if (!run.sourceFingerprint) return { ...UNKNOWN };
   const result = {
@@ -29685,7 +29788,7 @@ async function checkRunStaleness(run) {
   if (run.sourceFingerprint.rawTokensPath) {
     const absPath = run.sourceFingerprint.rawTokensPath;
     try {
-      const [st, buf] = await Promise.all([stat7(absPath), readFile25(absPath)]);
+      const [st, buf] = await Promise.all([stat7(absPath), readFile26(absPath)]);
       const mtime = st.mtime.toISOString();
       const hash = sha256Hex(buf);
       const mtimeChanged = run.sourceFingerprint.rawTokensMtime !== null && mtime !== run.sourceFingerprint.rawTokensMtime;
@@ -29701,9 +29804,9 @@ async function checkRunStaleness(run) {
   }
   if (run.savedFingerprint) {
     if (run.savedFingerprint.componentsJsonHash !== null) {
-      const compPath = join24(run.savePath, "components.json");
+      const compPath = join25(run.savePath, "components.json");
       try {
-        const buf = await readFile25(compPath);
+        const buf = await readFile26(compPath);
         if (sha256Hex(buf) !== run.savedFingerprint.componentsJsonHash) {
           result.savedComponentsEdited = true;
           result.stale = true;
@@ -29714,9 +29817,9 @@ async function checkRunStaleness(run) {
       }
     }
     if (run.savedFingerprint.tokensJsonHash !== null) {
-      const tokensPath = run.tokensPath ?? join24(run.savePath, "tokens.json");
+      const tokensPath = run.tokensPath ?? join25(run.savePath, "tokens.json");
       try {
-        const buf = await readFile25(tokensPath);
+        const buf = await readFile26(tokensPath);
         if (sha256Hex(buf) !== run.savedFingerprint.tokensJsonHash) {
           result.savedTokensEdited = true;
           result.stale = true;
@@ -29780,23 +29883,23 @@ __export(push_creds_prompt_exports, {
 });
 import React29 from "react";
 async function promptForPushCredentials(opts = {}) {
-  const { render: render7, Box: Box52, Text: Text54 } = await import("ink");
-  const { useState: useState30 } = await import("react");
+  const { render: render7, Box: Box50, Text: Text52 } = await import("ink");
+  const { useState: useState29 } = await import("react");
   const { CredentialsStep: CredentialsStep2 } = await Promise.resolve().then(() => (init_CredentialsStep(), CredentialsStep_exports));
-  return new Promise((resolve27, reject) => {
+  return new Promise((resolve28, reject) => {
     let app = null;
     function App2() {
-      const [done, setDone] = useState30(false);
+      const [done, setDone] = useState29(false);
       const handle = (spaceId, environmentId, cmaToken, host) => {
         if (done) return;
         setDone(true);
         queueMicrotask(() => {
           app?.unmount();
-          resolve27({ spaceId, environmentId, cmaToken, host });
+          resolve28({ spaceId, environmentId, cmaToken, host });
         });
       };
       if (done) {
-        return React29.createElement(Box52, null, React29.createElement(Text54, null, ""));
+        return React29.createElement(Box50, null, React29.createElement(Text52, null, ""));
       }
       return React29.createElement(CredentialsStep2, {
         summary: opts.summary ?? "Enter Contentful credentials to push this run. Press Enter on each field to advance.",
@@ -29821,1122 +29924,17 @@ var init_push_creds_prompt = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/lib/agent-definitions.ts
-var AGENT_DEFS;
-var init_agent_definitions = __esm({
-  "packages/experience-design-system-cli/src/lib/agent-definitions.ts"() {
-    "use strict";
-    AGENT_DEFS = [
-      { name: "Claude Code", binary: "claude", installHint: "npm install -g @anthropic-ai/claude-code && claude login" },
-      { name: "OpenAI Codex", binary: "codex", installHint: "npm install -g @openai/codex  (requires OPENAI_API_KEY)" },
-      { name: "OpenCode", binary: "opencode", installHint: "npm install -g opencode-ai && opencode auth" },
-      { name: "GitHub Copilot", binary: "copilot", installHint: "npm install -g @github/copilot && copilot" }
-    ];
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/lib/shell.ts
-import { execFile as execFile5, spawn as spawn5 } from "node:child_process";
-import { appendFile as appendFile2, readFile as readFile27, access as access10 } from "node:fs/promises";
-import { homedir as homedir9 } from "node:os";
-import { join as join26 } from "node:path";
-import { promisify as promisify2 } from "node:util";
-async function binaryExists(name) {
-  try {
-    await execFileAsync2("which", [name]);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function pathExists5(path) {
-  return access10(path).then(() => true).catch(() => false);
-}
-function runSpawn(cmd, args, opts = {}) {
-  return new Promise((resolve27) => {
-    const child = spawn5(cmd, args, {
-      cwd: opts.cwd,
-      env: opts.env ?? process.env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let settled = false;
-    let stdout = "";
-    let stderr = "";
-    const settle = (result) => {
-      if (settled) return;
-      settled = true;
-      resolve27(result);
-    };
-    child.on("error", (err) => settle({ exitCode: 1, stdout: "", stderr: err.message }));
-    child.stdout.on("data", (d) => {
-      stdout += String(d);
-    });
-    child.stderr.on("data", (d) => {
-      stderr += String(d);
-    });
-    child.on("exit", (code) => settle({ exitCode: code ?? 1, stdout, stderr }));
-  });
-}
-async function detectShellProfile() {
-  const shell = process.env["SHELL"] ?? "";
-  const home = homedir9();
-  if (shell.includes("zsh")) return join26(home, ".zshrc");
-  if (shell.includes("bash")) {
-    const bashProfile = join26(home, ".bash_profile");
-    return await pathExists5(bashProfile) ? bashProfile : join26(home, ".bashrc");
-  }
-  if (shell.includes("fish")) return join26(home, ".config", "fish", "config.fish");
-  return join26(home, ".profile");
-}
-async function profileContains(profilePath, value) {
-  try {
-    const content = await readFile27(profilePath, "utf8");
-    return content.includes(value);
-  } catch {
-    return false;
-  }
-}
-async function appendToProfile(profilePath, lines) {
-  await appendFile2(profilePath, `
-${lines}
-`, "utf8");
-}
-var execFileAsync2, REQUIRED_NODE_MAJOR;
-var init_shell = __esm({
-  "packages/experience-design-system-cli/src/setup/lib/shell.ts"() {
-    "use strict";
-    execFileAsync2 = promisify2(execFile5);
-    REQUIRED_NODE_MAJOR = 24;
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/lib/checks.ts
-import { join as join27 } from "node:path";
-function checkNodeVersion(nodeVersion = process.versions.node) {
-  const major = Number.parseInt(nodeVersion.split(".")[0], 10);
-  return { passed: major >= REQUIRED_NODE_MAJOR, version: nodeVersion, major, required: REQUIRED_NODE_MAJOR };
-}
-async function detectNodeVersionManagers(homeDir, deps = { binaryExists, pathExists: pathExists5 }) {
-  const nvmScript = join27(homeDir, ".nvm", "nvm.sh");
-  return {
-    nvm: await deps.binaryExists("nvm") || await deps.pathExists(nvmScript),
-    fnm: await deps.binaryExists("fnm"),
-    nvmScript
-  };
-}
-async function detectPnpm(deps = { binaryExists, run: runSpawn }) {
-  if (!await deps.binaryExists("pnpm")) return { status: "missing" };
-  const version = await deps.run("pnpm", ["--version"]);
-  if (version.exitCode !== 0) return { status: "broken" };
-  return { status: "ok", version: version.stdout.trim() };
-}
-async function checkPnpm(pkgRoot, deps = { binaryExists, run: runSpawn }) {
-  const detected = await detectPnpm(deps);
-  if (detected.status !== "ok") return detected;
-  const ping = await deps.run("pnpm", ["exec", "node", "--version"], { cwd: pkgRoot });
-  if (ping.exitCode !== 0) return { status: "unusable-in-repo", version: detected.version };
-  return detected;
-}
-async function installDependencies(pkgRoot, deps = { pathExists: pathExists5, run: runSpawn }) {
-  const hadNodeModules = await deps.pathExists(join27(pkgRoot, "node_modules"));
-  const repoRoot = join27(pkgRoot, "..", "..");
-  const result = await deps.run("pnpm", ["install", "--frozen-lockfile"], { cwd: repoRoot });
-  return { passed: result.exitCode === 0, hadNodeModules, result };
-}
-async function buildCli(repoRoot, deps = { run: runSpawn }) {
-  const result = await deps.run("pnpm", ["--filter", "@contentful/experience-design-system-cli", "run", "build"], {
-    cwd: repoRoot
-  });
-  return { passed: result.exitCode === 0, result };
-}
-var init_checks = __esm({
-  "packages/experience-design-system-cli/src/setup/lib/checks.ts"() {
-    "use strict";
-    init_shell();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/lib/layout.ts
-function shouldUseWideStepper(columns) {
-  return columns !== void 0 && columns >= WIDE_STEPPER_MIN_COLUMNS;
-}
-function setupStepperSeparator(columns) {
-  return shouldUseWideStepper(columns) ? WIDE_STEPPER_SEPARATOR : COMPACT_STEPPER_SEPARATOR;
-}
-function setupStepperEntries(activeStep, columns) {
-  const isWide = shouldUseWideStepper(columns);
-  return SETUP_SCREENS.map((screen, index) => {
-    const step = index + 1;
-    const state = step < activeStep ? "complete" : step === activeStep ? "active" : "pending";
-    const compactLabel = state === "complete" ? "\u2713" : state === "active" ? `[${step}]` : `${step}`;
-    const wideLabel = state === "complete" ? `\u2713 ${screen.title}` : state === "active" ? `[${step} ${screen.title}]` : `${step} ${screen.title}`;
-    return { step, title: screen.title, state, label: isWide ? wideLabel : compactLabel };
-  });
-}
-function shouldAlignVersionRight(version, columns) {
-  const contentWidth = SETUP_TITLE.length + HEADER_INLINE_GAP + `v${version}`.length;
-  return columns !== void 0 && columns >= contentWidth;
-}
-function countRequiredFailures(results) {
-  return results.filter((result) => result.required && result.status === "failed").length;
-}
-function formatSetupCompletionMessage(results) {
-  const requiredFailed = countRequiredFailures(results);
-  if (requiredFailed === 0) return "\u2713 Setup complete. You can now run: experiences import";
-  return `\u26A0 ${requiredFailed} required step${requiredFailed === 1 ? "" : "s"} incomplete.`;
-}
-var SETUP_SCREENS, SETUP_TITLE, WIDE_STEPPER_SEPARATOR, COMPACT_STEPPER_SEPARATOR, HEADER_INLINE_GAP, WIDE_STEPPER_MIN_COLUMNS;
-var init_layout = __esm({
-  "packages/experience-design-system-cli/src/setup/lib/layout.ts"() {
-    "use strict";
-    SETUP_SCREENS = [
-      { title: "Prerequisites", kind: "required" },
-      { title: "Coding agent", kind: "required" },
-      { title: "Contentful", kind: "optional" },
-      { title: "Preferences", kind: "optional" }
-    ];
-    SETUP_TITLE = "experiences setup";
-    WIDE_STEPPER_SEPARATOR = "  \xB7  ";
-    COMPACT_STEPPER_SEPARATOR = "  ";
-    HEADER_INLINE_GAP = 2;
-    WIDE_STEPPER_MIN_COLUMNS = SETUP_SCREENS.map((screen, index) => {
-      const label = `${index + 1} ${screen.title}`;
-      return index === 0 ? `[${label}]` : label;
-    }).join(WIDE_STEPPER_SEPARATOR).length;
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/lib/prompt-input.ts
-function splitPromptInput(input) {
-  const cleaned = stripBracketedPasteMarkers(input);
-  const newlineIndex = cleaned.search(/[\r\n]/);
-  if (newlineIndex === -1) return { text: stripControlCharacters(cleaned), submitted: false };
-  return { text: stripControlCharacters(cleaned.slice(0, newlineIndex)), submitted: true };
-}
-function stripBracketedPasteMarkers(value) {
-  return value.replace(/\x1b\[20[01]~/g, "");
-}
-function stripControlCharacters(value) {
-  return value.replace(/[\x00-\x1f\x7f]/g, "");
-}
-var init_prompt_input = __esm({
-  "packages/experience-design-system-cli/src/setup/lib/prompt-input.ts"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/tui/usePromptInput.ts
-import { useLayoutEffect as useLayoutEffect2, useRef as useRef10 } from "react";
-import { useStdin as useStdin2 } from "ink";
-function parseKey(data) {
-  const code = data.length === 1 ? data.charCodeAt(0) : -1;
-  const isReturn = data === "\r" || data === "\n";
-  const isTab = data === "	" || data === "\x1B[Z";
-  const isDelete = data === "\x1B[3~";
-  const isPaste = data.startsWith(BRACKETED_PASTE_START);
-  const upArrow = data === "\x1B[A";
-  const downArrow = data === "\x1B[B";
-  const isEscapeSequence = isPaste || isTab || isDelete || upArrow || downArrow;
-  return {
-    return: isReturn,
-    escape: data === "\x1B",
-    tab: isTab,
-    backspace: data === "\x7F" || data === "\b",
-    delete: isDelete,
-    upArrow,
-    downArrow,
-    ctrl: !isReturn && !isTab && code >= 1 && code <= 26,
-    meta: !isEscapeSequence && data.length > 1 && data.startsWith("\x1B")
-  };
-}
-function usePromptInput(handler) {
-  const { stdin, setRawMode } = useStdin2();
-  const handlerRef = useRef10(handler);
-  handlerRef.current = handler;
-  useLayoutEffect2(() => {
-    setRawMode(true);
-    const handleData = (data) => {
-      const chunk = Buffer.isBuffer(data) ? data.toString("utf8") : data;
-      handlerRef.current(chunk, parseKey(chunk));
-    };
-    stdin.on("data", handleData);
-    return () => {
-      stdin.off("data", handleData);
-      setRawMode(false);
-    };
-  }, [stdin, setRawMode]);
-}
-var BRACKETED_PASTE_START;
-var init_usePromptInput = __esm({
-  "packages/experience-design-system-cli/src/setup/tui/usePromptInput.ts"() {
-    "use strict";
-    BRACKETED_PASTE_START = "\x1B[200~";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/tui/SetupStepper.tsx
-import React30 from "react";
-import { Box as Box50, Text as Text52 } from "ink";
-import { jsx as jsx53, jsxs as jsxs52 } from "react/jsx-runtime";
-function stepColor(state) {
-  if (state === "complete") return PALETTE.success;
-  if (state === "active") return PALETTE.info;
-  return void 0;
-}
-function SetupStepper({ activeStep, columns }) {
-  const entries = setupStepperEntries(activeStep, columns);
-  const separator = setupStepperSeparator(columns);
-  return /* @__PURE__ */ jsx53(Box50, { children: entries.map((entry, index) => /* @__PURE__ */ jsxs52(React30.Fragment, { children: [
-    index > 0 && /* @__PURE__ */ jsx53(Text52, { dimColor: true, children: separator }),
-    /* @__PURE__ */ jsx53(Text52, { bold: entry.state === "active", dimColor: entry.state === "pending", color: stepColor(entry.state), children: entry.label })
-  ] }, entry.step)) });
-}
-var init_SetupStepper = __esm({
-  "packages/experience-design-system-cli/src/setup/tui/SetupStepper.tsx"() {
-    "use strict";
-    init_theme();
-    init_layout();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/lib/types.ts
-function emit(dependencies, kind, message) {
-  dependencies.write({ kind, message });
-}
-var init_types4 = __esm({
-  "packages/experience-design-system-cli/src/setup/lib/types.ts"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/coding-agent.ts
-async function promptCodexModel(dependencies) {
-  if (dependencies.env["OPENAI_API_KEY"]) return void 0;
-  emit(dependencies, "warning", "No OPENAI_API_KEY \u2014 using ChatGPT account authentication.");
-  emit(dependencies, "info", "Tip: run codex then type /model to browse all available models.");
-  const model = (await dependencies.ask("Model name (optional - press Enter for Codex default): ")).trim();
-  return model || void 0;
-}
-async function runAgentSetup(dependencies) {
-  emit(dependencies, "info", "Experiences import uses a coding agent to generate component definitions.");
-  const found = (await Promise.all(
-    AGENT_DEFS.map(async (agent) => await dependencies.binaryExists(agent.binary) ? agent : void 0)
-  )).filter((agent) => agent !== void 0);
-  if (found.length === 1) {
-    const selected2 = found[0];
-    emit(dependencies, "success", `${selected2.name} (${selected2.binary}) found`);
-    const agentModel2 = selected2.binary === "codex" ? await promptCodexModel(dependencies) : void 0;
-    return { agent: selected2.binary, agentModel: agentModel2, passed: true };
-  }
-  if (found.length > 1) {
-    const index2 = await dependencies.choose(
-      "Multiple coding agents found. Choose one to use as the default:",
-      found.map((agent) => ({ label: agent.name, description: agent.binary }))
-    );
-    if (index2 === void 0) return { agent: void 0, agentModel: void 0, passed: false };
-    const selected2 = found[index2] ?? found[0];
-    const agentModel2 = selected2.binary === "codex" ? await promptCodexModel(dependencies) : void 0;
-    return { agent: selected2.binary, agentModel: agentModel2, passed: true };
-  }
-  emit(dependencies, "warning", "No coding agent found on PATH");
-  const installable = AGENT_DEFS.slice(0, 3);
-  const index = await dependencies.choose(
-    "Choose one to install:",
-    installable.map((agent) => ({ label: agent.name, description: agent.installHint }))
-  );
-  const selected = index === void 0 ? void 0 : installable[index];
-  if (!selected) return { agent: void 0, agentModel: void 0, passed: false };
-  const packageName = selected.binary === "claude" ? "@anthropic-ai/claude-code" : selected.binary === "codex" ? "@openai/codex" : "opencode-ai";
-  const installed = await dependencies.run("npm", ["install", "-g", packageName]);
-  if (installed.exitCode !== 0 || !await dependencies.binaryExists(selected.binary)) {
-    emit(dependencies, "failure", "Install failed");
-    return { agent: void 0, agentModel: void 0, passed: false };
-  }
-  emit(dependencies, "success", `${selected.name} installed`);
-  const agentModel = selected.binary === "codex" ? await promptCodexModel(dependencies) : void 0;
-  return { agent: selected.binary, agentModel, passed: true };
-}
-var init_coding_agent = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/coding-agent.ts"() {
-    "use strict";
-    init_agent_definitions();
-    init_types4();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/contentful.ts
-function emitCurrentValue(dependencies, label, value) {
-  const paddedLabel = label.padEnd(CURRENT_VALUE_LABEL_WIDTH);
-  if (value) emit(dependencies, "value", `${paddedLabel}${value}`);
-  else emit(dependencies, "warning", `${paddedLabel}(not set)`);
-}
-async function runCredentialsSetup(dependencies) {
-  emit(
-    dependencies,
-    "help",
-    `Saved to ${dependencies.credentialsPath()} \u2014 loaded automatically by experiences import.`
-  );
-  emit(dependencies, "info", "");
-  const envShadowing = [
-    dependencies.env["CONTENTFUL_SPACE_ID"] ? "CONTENTFUL_SPACE_ID" : void 0,
-    dependencies.env["CONTENTFUL_ENVIRONMENT_ID"] ? "CONTENTFUL_ENVIRONMENT_ID" : void 0,
-    dependencies.env["CONTENTFUL_MANAGEMENT_TOKEN"] ? "CONTENTFUL_MANAGEMENT_TOKEN" : void 0,
-    dependencies.env["EDS_HOST"] ? "EDS_HOST" : void 0
-  ].filter((value) => value !== void 0);
-  if (envShadowing.length > 0) {
-    emit(
-      dependencies,
-      "warning",
-      `Env vars set: ${envShadowing.join(", ")}. Values saved here take precedence; env vars only apply where disk is empty.`
-    );
-  }
-  const stored = await dependencies.readCredentials();
-  const currentHost = stored.host ?? DEFAULT_CONFIGURED_HOST;
-  const hasAny = Boolean(stored.spaceId || stored.environmentId || stored.cmaToken);
-  const allSet = Boolean(stored.spaceId && stored.environmentId && stored.cmaToken);
-  if (hasAny) {
-    emit(dependencies, "info", "Current values:");
-    emitCurrentValue(dependencies, "Space ID", stored.spaceId);
-    emitCurrentValue(dependencies, "Environment ID", stored.environmentId);
-    emitCurrentValue(
-      dependencies,
-      "CMA Token",
-      stored.cmaToken && `${"\u2022".repeat(Math.min(stored.cmaToken.length, 8))}...`
-    );
-    emitCurrentValue(dependencies, "API Host", currentHost);
-  }
-  if (!await dependencies.confirm(hasAny ? "Update credentials?" : "Configure Contentful credentials?", !allSet)) {
-    if (allSet) emit(dependencies, "success", "Credentials already configured \u2014 no changes made");
-    else emit(dependencies, "warning", "Skipped. experiences import will prompt for credentials interactively.");
-    return { passed: true };
-  }
-  const spaceId = await dependencies.ask(`Space ID${stored.spaceId ? ` [${stored.spaceId}]` : ""}: `) || stored.spaceId;
-  const environmentId = await dependencies.ask(`Environment ID [${stored.environmentId || "master"}]: `) || stored.environmentId || "master";
-  const cmaToken = await dependencies.askSecret(
-    `CMA token${stored.cmaToken ? " [press Enter to keep existing]" : " (paste here)"}: `
-  ) || stored.cmaToken;
-  if (!spaceId || !cmaToken) {
-    emit(dependencies, "warning", "Space ID and CMA token are required. Skipped.");
-    return { passed: false };
-  }
-  const hostInput = await dependencies.ask(`API host [${currentHost}]: `);
-  const host = toConfiguredHost(hostInput) ?? stored.host;
-  await dependencies.writeCredentials({ ...stored, spaceId, environmentId, cmaToken, ...host ? { host } : {} });
-  emit(dependencies, "success", `Credentials saved to ${dependencies.credentialsPath()}`);
-  emit(dependencies, "success", `API host set to ${host ?? DEFAULT_CONFIGURED_HOST}`);
-  emit(dependencies, "info", "Run experiences import \u2014 credentials will be pre-filled automatically.");
-  return { passed: true };
-}
-var CURRENT_VALUE_LABEL_WIDTH;
-var init_contentful = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/contentful.ts"() {
-    "use strict";
-    init_host_utils();
-    init_types4();
-    CURRENT_VALUE_LABEL_WIDTH = "Environment ID".length + 2;
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/lib/yes-no-prompt.ts
-async function askYesNo(ask, question, defaultValue) {
-  const hint = defaultValue ? "[Y/n]" : "[y/N]";
-  const answer = (await ask(`${question} ${hint} `)).trim().toLowerCase();
-  if (answer.startsWith("y")) return true;
-  if (answer.startsWith("n")) return false;
-  return defaultValue;
-}
-var init_yes_no_prompt = __esm({
-  "packages/experience-design-system-cli/src/setup/lib/yes-no-prompt.ts"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/analytics.ts
-async function promptAnalyticsPreference(ask, current) {
-  return askYesNo(ask, "Disable anonymous usage analytics?", current ?? false);
-}
-async function configureAnalytics(dependencies) {
-  emit(dependencies, "page", ANALYTICS_HELP);
-  const stored = await dependencies.readCredentials();
-  const analyticsDisabled = await promptAnalyticsPreference(dependencies.ask, stored.analyticsDisabled);
-  if (analyticsDisabled !== (stored.analyticsDisabled ?? false))
-    await dependencies.writeCredentials({ ...stored, analyticsDisabled });
-}
-var ANALYTICS_HELP;
-var init_analytics2 = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/analytics.ts"() {
-    "use strict";
-    init_yes_no_prompt();
-    init_types4();
-    ANALYTICS_HELP = "Shares anonymous usage data about which CLI commands run.";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/auto-filter.ts
-async function promptAutoFilterPreference(ask, current) {
-  return askYesNo(ask, "Enable AI auto-filter by default?", current ?? true);
-}
-async function configureAutoFilter(dependencies) {
-  emit(dependencies, "page", AUTO_FILTER_HELP);
-  const stored = await dependencies.readCredentials();
-  const autoFilter = await promptAutoFilterPreference(dependencies.ask, stored.autoFilter);
-  if (autoFilter !== (stored.autoFilter ?? true)) await dependencies.writeCredentials({ ...stored, autoFilter });
-}
-var AUTO_FILTER_HELP;
-var init_auto_filter = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/auto-filter.ts"() {
-    "use strict";
-    init_yes_no_prompt();
-    init_types4();
-    AUTO_FILTER_HELP = "Filters out components irrelevant to experience orchestration during extraction.";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/concurrency.ts
-async function configureConcurrency(dependencies, profilePath) {
-  emit(dependencies, "page", CONCURRENCY_HELP);
-  if (await dependencies.profileContains(profilePath, PROFILE_VARIABLE)) return;
-  if (!await dependencies.confirm("Speed up component analysis on this machine?", false)) return;
-  await dependencies.appendToProfile(profilePath, `# experiences performance
-export ${PROFILE_VARIABLE}=8`);
-}
-var CONCURRENCY_HELP, PROFILE_VARIABLE;
-var init_concurrency = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/concurrency.ts"() {
-    "use strict";
-    init_types4();
-    CONCURRENCY_HELP = "Analyzes more components at once, which is faster on machines with spare cores.";
-    PROFILE_VARIABLE = "EDS_EXTRACT_CONCURRENCY";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/custom-prompts.ts
-async function promptCustomSkillPathAction(kind, current, ask) {
-  const label = kind === "select" ? "select (analyze select-agent)" : "generate (generate components)";
-  const answer = await ask(
-    `Custom ${label} prompt path${current ? ` [${current}]` : " [none]"} (empty=keep, "-"=clear): `
-  );
-  const trimmed = answer.trim();
-  return trimmed === "" ? void 0 : trimmed === "-" ? null : trimmed;
-}
-async function configureCustomPrompts(dependencies) {
-  emit(dependencies, "page", CUSTOM_PROMPTS_HELP);
-  if (!await dependencies.confirm("Use your own prompt files instead of the built-in ones?", false)) return;
-  const stored = await dependencies.readCredentials();
-  const selectPromptPath = await promptCustomSkillPathAction("select", stored.selectPromptPath, dependencies.ask);
-  const generatePromptPath = await promptCustomSkillPathAction("generate", stored.generatePromptPath, dependencies.ask);
-  const updated = { ...stored };
-  if (selectPromptPath === null) delete updated.selectPromptPath;
-  else if (selectPromptPath !== void 0) updated.selectPromptPath = selectPromptPath;
-  if (generatePromptPath === null) delete updated.generatePromptPath;
-  else if (generatePromptPath !== void 0) updated.generatePromptPath = generatePromptPath;
-  await dependencies.writeCredentials(updated);
-}
-var CUSTOM_PROMPTS_HELP;
-var init_custom_prompts = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/custom-prompts.ts"() {
-    "use strict";
-    init_types4();
-    CUSTOM_PROMPTS_HELP = "Replaces the built-in instructions the coding agent follows when it selects and generates components.";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/debug.ts
-async function promptDebugModePreference(ask, current) {
-  return askYesNo(ask, "Enable debug logging by default?", current ?? false);
-}
-async function configureDebug(dependencies) {
-  emit(dependencies, "page", DEBUG_HELP);
-  const stored = await dependencies.readCredentials();
-  const debug = await promptDebugModePreference(dependencies.ask, stored.debug);
-  if (debug !== (stored.debug ?? false)) await dependencies.writeCredentials({ ...stored, debug });
-}
-var DEBUG_HELP;
-var init_debug = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/debug.ts"() {
-    "use strict";
-    init_yes_no_prompt();
-    init_types4();
-    DEBUG_HELP = "Writes a verbose trace of every command decision, for troubleshooting.";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/no-color.ts
-async function configureNoColor(dependencies, profilePath) {
-  emit(dependencies, "page", NO_COLOR_HELP);
-  if (!await dependencies.confirm("Turn off colored output?", false)) return;
-  if (await dependencies.profileContains(profilePath, PROFILE_VARIABLE2)) return;
-  await dependencies.appendToProfile(profilePath, `export ${PROFILE_VARIABLE2}=1`);
-}
-var NO_COLOR_HELP, PROFILE_VARIABLE2;
-var init_no_color = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/no-color.ts"() {
-    "use strict";
-    init_types4();
-    NO_COLOR_HELP = "Prints plain text with no color, which suits CI logs and basic terminals.";
-    PROFILE_VARIABLE2 = "NO_COLOR";
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/preferences/index.ts
-async function runPreferenceSetupAction(dependencies, profilePath) {
-  for (const option of PREFERENCE_OPTIONS) {
-    await option.configure(dependencies, profilePath);
-  }
-  return { selected: PREFERENCE_OPTIONS.map((option) => option.key) };
-}
-var PREFERENCE_OPTIONS;
-var init_preferences = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/preferences/index.ts"() {
-    "use strict";
-    init_analytics2();
-    init_auto_filter();
-    init_concurrency();
-    init_custom_prompts();
-    init_debug();
-    init_no_color();
-    PREFERENCE_OPTIONS = [
-      { key: "autoFilter", label: "AI auto-filter", configure: configureAutoFilter },
-      { key: "concurrency", label: "Performance concurrency", configure: configureConcurrency },
-      { key: "customPrompts", label: "Custom prompts", configure: configureCustomPrompts },
-      { key: "debug", label: "Debug logging", configure: configureDebug },
-      { key: "analytics", label: "Usage analytics", configure: configureAnalytics },
-      { key: "noColor", label: "Disable terminal colors", configure: configureNoColor }
-    ];
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/prerequisites/build.ts
-async function runBuildSetup(dependencies, repoRoot) {
-  emit(dependencies, "info", "Running pnpm install...");
-  const install = await dependencies.run("pnpm", ["install", "--frozen-lockfile"], { cwd: repoRoot });
-  if (install.exitCode !== 0) {
-    emit(dependencies, "failure", "pnpm install failed");
-    return { passed: false };
-  }
-  emit(dependencies, "success", "Dependencies installed");
-  emit(dependencies, "info", "Building CLI...");
-  const build = await dependencies.run(
-    "pnpm",
-    ["--filter", "@contentful/experience-design-system-cli", "run", "build"],
-    { cwd: repoRoot }
-  );
-  if (build.exitCode !== 0) {
-    emit(dependencies, "failure", "Build failed");
-    return { passed: false };
-  }
-  emit(dependencies, "success", "CLI built successfully");
-  return { passed: true };
-}
-var init_build = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/prerequisites/build.ts"() {
-    "use strict";
-    init_types4();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/prerequisites/node.ts
-async function runNodeSetup(dependencies) {
-  const check = checkNodeVersion(dependencies.nodeVersion);
-  if (check.passed) {
-    emit(dependencies, "success", `Node.js v${check.version} \u2014 already good`);
-    return { passed: true };
-  }
-  emit(dependencies, "failure", `Node.js v${check.version} \u2014 need v${check.required}+`);
-  const { nvm: hasNvm, fnm: hasFnm, nvmScript } = await detectNodeVersionManagers(dependencies.homeDir, dependencies);
-  if (hasNvm) {
-    emit(
-      dependencies,
-      "info",
-      `nvm detected. Will run: nvm install ${REQUIRED_NODE_MAJOR} && nvm use ${REQUIRED_NODE_MAJOR}`
-    );
-    if (!await dependencies.confirm(`Install and switch to Node ${REQUIRED_NODE_MAJOR} via nvm?`)) {
-      emit(
-        dependencies,
-        "warning",
-        `Skipped. Re-run experiences setup after switching to Node ${REQUIRED_NODE_MAJOR}.`
-      );
-      return { passed: false };
-    }
-    const result2 = await dependencies.run("bash", [
-      "-c",
-      `source "${nvmScript}" && nvm install ${REQUIRED_NODE_MAJOR} && nvm alias default ${REQUIRED_NODE_MAJOR}`
-    ]);
-    if (result2.exitCode !== 0) {
-      emit(dependencies, "failure", "nvm install failed");
-      emit(dependencies, "info", `Run manually: nvm install ${REQUIRED_NODE_MAJOR} && nvm use ${REQUIRED_NODE_MAJOR}`);
-      return { passed: false };
-    }
-    emit(
-      dependencies,
-      "success",
-      `Node ${REQUIRED_NODE_MAJOR} installed via nvm. Re-run experiences setup in a fresh shell to pick it up.`
-    );
-    return { passed: false, restartRequired: true };
-  }
-  if (hasFnm) {
-    emit(
-      dependencies,
-      "info",
-      `fnm detected. Will run: fnm install ${REQUIRED_NODE_MAJOR} && fnm use ${REQUIRED_NODE_MAJOR}`
-    );
-    if (!await dependencies.confirm(`Install and switch to Node ${REQUIRED_NODE_MAJOR} via fnm?`)) {
-      emit(
-        dependencies,
-        "warning",
-        `Skipped. Re-run experiences setup after switching to Node ${REQUIRED_NODE_MAJOR}.`
-      );
-      return { passed: false };
-    }
-    const install = await dependencies.run("fnm", ["install", String(REQUIRED_NODE_MAJOR)]);
-    if (install.exitCode !== 0) {
-      emit(dependencies, "failure", "fnm install failed");
-      return { passed: false };
-    }
-    const useResult = await dependencies.run("fnm", ["use", String(REQUIRED_NODE_MAJOR)]);
-    if (useResult.exitCode !== 0) {
-      emit(dependencies, "warning", `fnm use ${REQUIRED_NODE_MAJOR} failed \u2014 node installed but not activated`);
-      emit(dependencies, "info", `Run manually: fnm use ${REQUIRED_NODE_MAJOR} && fnm default ${REQUIRED_NODE_MAJOR}`);
-    } else {
-      const defaultResult = await dependencies.run("fnm", ["default", String(REQUIRED_NODE_MAJOR)]);
-      if (defaultResult.exitCode !== 0) {
-        emit(
-          dependencies,
-          "warning",
-          `fnm default ${REQUIRED_NODE_MAJOR} failed \u2014 version won't persist across new shells`
-        );
-        emit(dependencies, "info", `Run manually: fnm default ${REQUIRED_NODE_MAJOR}`);
-      }
-    }
-    emit(
-      dependencies,
-      "success",
-      `Node ${REQUIRED_NODE_MAJOR} installed via fnm. Re-run experiences setup in a fresh shell.`
-    );
-    return { passed: false, restartRequired: true };
-  }
-  emit(dependencies, "info", "No Node version manager detected (nvm or fnm).");
-  if (!await dependencies.confirm("Install nvm now? (recommended)")) {
-    emit(dependencies, "info", `Install Node ${REQUIRED_NODE_MAJOR} manually from https://nodejs.org`);
-    return { passed: false };
-  }
-  const result = await dependencies.run("bash", [
-    "-c",
-    "curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash"
-  ]);
-  if (result.exitCode !== 0) {
-    emit(dependencies, "failure", "nvm install failed");
-    return { passed: false };
-  }
-  emit(dependencies, "success", "nvm installed. Open a new shell, then re-run experiences setup.");
-  return { passed: false, restartRequired: true };
-}
-var init_node = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/prerequisites/node.ts"() {
-    "use strict";
-    init_checks();
-    init_shell();
-    init_types4();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/prerequisites/pnpm.ts
-async function runPnpmSetup(dependencies) {
-  const detected = await detectPnpm(dependencies);
-  if (detected.status === "ok") {
-    emit(dependencies, "success", `pnpm v${detected.version} \u2014 already installed`);
-    return { passed: true };
-  }
-  emit(dependencies, "failure", "pnpm not found");
-  if (await dependencies.binaryExists("corepack")) {
-    emit(dependencies, "info", "Will run: corepack enable && corepack prepare pnpm@latest --activate");
-    if (await dependencies.confirm("Install pnpm via corepack?")) {
-      const enabled = await dependencies.run("corepack", ["enable"]);
-      const installed = enabled.exitCode === 0 ? await dependencies.run("corepack", ["prepare", "pnpm@latest", "--activate"]) : enabled;
-      if (installed.exitCode === 0) {
-        emit(dependencies, "success", "pnpm installed via corepack");
-        return { passed: true };
-      }
-      emit(dependencies, "failure", "corepack install failed");
-      return { passed: false };
-    }
-  }
-  emit(dependencies, "info", "Will run: npm install -g pnpm");
-  if (!await dependencies.confirm("Install pnpm via npm?")) {
-    emit(dependencies, "warning", "Skipped. Install pnpm manually: npm install -g pnpm");
-    return { passed: false };
-  }
-  const result = await dependencies.run("npm", ["install", "-g", "pnpm"]);
-  if (result.exitCode !== 0) {
-    emit(dependencies, "failure", "npm install -g pnpm failed");
-    return { passed: false };
-  }
-  emit(dependencies, "success", "pnpm installed");
-  return { passed: true };
-}
-var init_pnpm = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/prerequisites/pnpm.ts"() {
-    "use strict";
-    init_checks();
-    init_types4();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/steps/prerequisites/index.ts
-async function runPrerequisitesSetup(dependencies, repoRoot, options = {}) {
-  const node = await runNodeSetup(dependencies);
-  if (!node.passed) return { node };
-  const pnpm = await runPnpmSetup(dependencies);
-  if (!pnpm.passed || options.skipBuild) return { node, pnpm };
-  const build = await runBuildSetup(dependencies, repoRoot);
-  return { node, pnpm, build };
-}
-var init_prerequisites = __esm({
-  "packages/experience-design-system-cli/src/setup/steps/prerequisites/index.ts"() {
-    "use strict";
-    init_build();
-    init_node();
-    init_pnpm();
-  }
-});
-
-// packages/experience-design-system-cli/src/setup/tui/SetupScreen.tsx
-var SetupScreen_exports = {};
-__export(SetupScreen_exports, {
-  SetupScreen: () => SetupScreen
-});
-import { useEffect as useEffect16, useRef as useRef11, useState as useState29 } from "react";
-import { Box as Box51, Text as Text53, useStdout as useStdout9 } from "ink";
-import { Select } from "@inkjs/ui";
-import { Fragment as Fragment16, jsx as jsx54, jsxs as jsxs53 } from "react/jsx-runtime";
-function SetupScreen({
-  version,
-  repoRoot,
-  profilePath,
-  dependencies,
-  skip = {},
-  columns: columnsOverride,
-  offerDoctor = false,
-  onComplete
-}) {
-  const { stdout } = useStdout9();
-  const columns = columnsOverride ?? stdout?.columns;
-  const [activeStep, setActiveStep] = useState29(1);
-  const [events, setEvents] = useState29([]);
-  const [prompt, setPrompt] = useState29(null);
-  const [pageHelp, setPageHelp] = useState29(null);
-  const [inputValue, setInputValue] = useState29("");
-  const inputValueRef = useRef11("");
-  const updateInput = (next) => {
-    inputValueRef.current = next;
-    setInputValue(next);
-  };
-  const [outcome, setOutcome] = useState29(null);
-  const [notice, setNotice] = useState29(null);
-  const startedRef = useRef11(false);
-  useEffect16(() => {
-    if (startedRef.current) return;
-    startedRef.current = true;
-    const request2 = (build) => new Promise((resolve27) => {
-      updateInput("");
-      setPrompt(build(resolve27));
-    });
-    const uiDependencies = {
-      ...dependencies,
-      ask: (question) => request2((resolve27) => ({ kind: "text", question, resolve: resolve27 })),
-      askSecret: (question) => request2((resolve27) => ({ kind: "secret", question, resolve: resolve27 })),
-      confirm: (question, defaultYes = true) => request2((resolve27) => ({ kind: "confirm", question, defaultYes, resolve: resolve27 })),
-      choose: (question, options) => request2((resolve27) => ({ kind: "select", question, options, resolve: resolve27 })),
-      write: (event) => {
-        if (event.kind === "page") {
-          setEvents([]);
-          setPageHelp(event.message);
-          return;
-        }
-        setEvents((current) => [...current, event]);
-      }
-    };
-    const enterStep = (step) => {
-      setActiveStep(step);
-      setEvents([]);
-      setPageHelp(null);
-    };
-    void (async () => {
-      const results = [];
-      const prerequisites = await runPrerequisitesSetup(uiDependencies, repoRoot, {
-        ...skip.skipBuild !== void 0 ? { skipBuild: skip.skipBuild } : {}
-      });
-      results.push({
-        name: "Node.js 24+",
-        status: prerequisites.node.passed ? "completed" : "failed",
-        required: true
-      });
-      if (!prerequisites.node.passed) {
-        setNotice("Node.js setup requires a shell restart. Re-run experiences setup afterwards.");
-        const restartOutcome = {
-          results,
-          exitCode: 0,
-          restartRequired: prerequisites.node.restartRequired ?? false,
-          runDoctor: false
-        };
-        setOutcome(restartOutcome);
-        onComplete(restartOutcome);
-        return;
-      }
-      results.push({ name: "pnpm", status: prerequisites.pnpm?.passed ? "completed" : "failed", required: true });
-      if (prerequisites.build) {
-        results.push({
-          name: "Install & build",
-          status: prerequisites.build.passed ? "completed" : "failed",
-          required: true
-        });
-      } else if (skip.skipBuild) {
-        results.push({ name: "Install & build", status: "skipped", required: false });
-      }
-      enterStep(2);
-      if (skip.skipAgent) {
-        results.push({ name: "Coding agent", status: "skipped", required: false });
-      } else {
-        const { agent, agentModel, passed } = await runAgentSetup(uiDependencies);
-        if (agent) {
-          const stored = await dependencies.readCredentials();
-          const { agentModel: _staleModel, ...storedWithoutModel } = stored;
-          await dependencies.writeCredentials({
-            ...storedWithoutModel,
-            agent,
-            ...agentModel ? { agentModel } : {}
-          });
-        }
-        results.push({ name: "Coding agent", status: passed ? "completed" : "failed", required: true });
-      }
-      enterStep(3);
-      if (skip.skipCredentials) {
-        results.push({ name: "Contentful credentials", status: "skipped", required: false });
-      } else {
-        const credentials = await runCredentialsSetup(uiDependencies);
-        results.push({
-          name: "Contentful credentials",
-          status: credentials.passed ? "completed" : "failed",
-          required: false
-        });
-      }
-      enterStep(4);
-      if (skip.skipOptional) {
-        results.push({ name: "Preferences", status: "skipped", required: false });
-      } else {
-        const { selected } = await runPreferenceSetupAction(uiDependencies, profilePath);
-        results.push({
-          name: "Preferences",
-          status: selected.length > 0 ? "completed" : "skipped",
-          required: false
-        });
-      }
-      const exitCode = countRequiredFailures(results) === 0 ? 0 : 1;
-      setPrompt(null);
-      setEvents([]);
-      setOutcome({ results, exitCode, restartRequired: false, runDoctor: false });
-      const runDoctor2 = offerDoctor ? await request2((resolve27) => ({
-        kind: "confirm",
-        question: "Run experiences doctor now to verify your environment?",
-        defaultYes: exitCode === 0,
-        resolve: resolve27
-      })) : false;
-      setPrompt(null);
-      const finalOutcome = { results, exitCode, restartRequired: false, runDoctor: runDoctor2 };
-      setOutcome(finalOutcome);
-      onComplete(finalOutcome);
-    })();
-  }, []);
-  usePromptInput((chunk, key) => {
-    const active = prompt;
-    if (!active) return;
-    if (active.kind === "select") return;
-    const submit = (value) => {
-      setPrompt(null);
-      updateInput("");
-      if (active.kind === "confirm") {
-        const answer = value.trim().toLowerCase();
-        active.resolve(answer === "" ? active.defaultYes : answer.startsWith("y"));
-      } else {
-        active.resolve(value.trim());
-      }
-    };
-    if (key.return) {
-      submit(inputValueRef.current);
-      return;
-    }
-    if (key.backspace || key.delete) {
-      updateInput(inputValueRef.current.slice(0, -1));
-      return;
-    }
-    if (key.ctrl || key.meta || key.escape || key.tab) return;
-    const { text, submitted } = splitPromptInput(chunk);
-    if (!text && !submitted) return;
-    const next = inputValueRef.current + text;
-    if (submitted) submit(next);
-    else updateInput(next);
-  });
-  const versionLabel = `v${version}`;
-  const alignRight = shouldAlignVersionRight(version, columns);
-  return /* @__PURE__ */ jsxs53(Box51, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs53(Box51, { children: [
-      /* @__PURE__ */ jsx54(Text53, { bold: true, children: SETUP_TITLE }),
-      alignRight ? /* @__PURE__ */ jsx54(Box51, { flexGrow: 1 }) : /* @__PURE__ */ jsx54(Text53, { children: " " }),
-      /* @__PURE__ */ jsx54(Text53, { dimColor: true, children: versionLabel })
-    ] }),
-    /* @__PURE__ */ jsx54(Box51, { marginTop: 1, children: /* @__PURE__ */ jsx54(SetupStepper, { activeStep, columns }) }),
-    outcome ? /* @__PURE__ */ jsx54(SetupSummary, { outcome, notice }) : /* @__PURE__ */ jsxs53(Fragment16, { children: [
-      /* @__PURE__ */ jsx54(SetupEventLog, { events }),
-      !prompt && /* @__PURE__ */ jsx54(Box51, { marginTop: 1, children: /* @__PURE__ */ jsxs53(Text53, { color: PALETTE.info, children: [
-        "\u27F3 ",
-        STEP_ACTIVITY[activeStep - 1],
-        "\u2026"
-      ] }) })
-    ] }),
-    prompt && (prompt.kind === "select" ? /* @__PURE__ */ jsx54(
-      SetupChoiceList,
-      {
-        prompt,
-        onResolve: (index) => {
-          setPrompt(null);
-          prompt.resolve(index);
-        }
-      }
-    ) : /* @__PURE__ */ jsx54(SetupPrompt, { prompt, value: inputValue })),
-    pageHelp && !outcome && /* @__PURE__ */ jsx54(Box51, { marginTop: 1, children: /* @__PURE__ */ jsx54(Text53, { dimColor: true, children: pageHelp }) })
-  ] });
-}
-function SetupEventLog({ events }) {
-  if (events.length === 0) return null;
-  return /* @__PURE__ */ jsx54(Box51, { flexDirection: "column", marginTop: 1, children: events.map((event, index) => /* @__PURE__ */ jsx54(SetupEventLine, { event }, `${index}-${event.message}`)) });
-}
-function SetupEventLine({ event }) {
-  if (event.message === "") return /* @__PURE__ */ jsx54(Text53, { children: " " });
-  if (event.kind === "success") return /* @__PURE__ */ jsxs53(Text53, { color: PALETTE.success, children: [
-    "\u2713 ",
-    event.message
-  ] });
-  if (event.kind === "failure") return /* @__PURE__ */ jsxs53(Text53, { color: PALETTE.error, children: [
-    "\u2717 ",
-    event.message
-  ] });
-  if (event.kind === "warning") return /* @__PURE__ */ jsxs53(Text53, { color: PALETTE.warning, children: [
-    "\u26A0 ",
-    event.message
-  ] });
-  if (event.kind === "help") return /* @__PURE__ */ jsx54(Text53, { dimColor: true, children: event.message });
-  if (event.kind === "value") return /* @__PURE__ */ jsxs53(Text53, { children: [
-    " ",
-    event.message
-  ] });
-  return /* @__PURE__ */ jsx54(Text53, { children: event.message });
-}
-function SetupChoiceList({
-  prompt,
-  onResolve
-}) {
-  const options = [
-    ...prompt.options.map((option, index) => ({
-      label: option.description ? `${option.label}  ${option.description}` : option.label,
-      value: String(index)
-    })),
-    { label: "Skip", value: SKIP_VALUE }
-  ];
-  return /* @__PURE__ */ jsxs53(Box51, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsx54(Text53, { children: prompt.question }),
-    /* @__PURE__ */ jsx54(Box51, { flexDirection: "column", marginTop: 1, children: /* @__PURE__ */ jsx54(
-      Select,
-      {
-        options,
-        visibleOptionCount: options.length,
-        onChange: (value) => onResolve(value === SKIP_VALUE ? void 0 : Number(value))
-      }
-    ) }),
-    /* @__PURE__ */ jsx54(Box51, { marginTop: 1, children: /* @__PURE__ */ jsx54(Text53, { dimColor: true, children: "\u2191\u2193 to move \xB7 Enter to select" }) })
-  ] });
-}
-function SetupPrompt({ prompt, value }) {
-  if (prompt.kind === "select") return /* @__PURE__ */ jsx54(Text53, { children: prompt.question });
-  const display = prompt.kind === "secret" ? "\u2022".repeat(value.length) : value;
-  const hint = prompt.kind === "confirm" ? prompt.defaultYes ? " [Y/n]" : " [y/N]" : "";
-  return /* @__PURE__ */ jsxs53(Box51, { marginTop: 1, children: [
-    /* @__PURE__ */ jsx54(Text53, { color: PALETTE.info, children: "\u203A " }),
-    /* @__PURE__ */ jsxs53(Text53, { children: [
-      prompt.question,
-      hint
-    ] }),
-    /* @__PURE__ */ jsxs53(Text53, { children: [
-      " ",
-      display
-    ] }),
-    /* @__PURE__ */ jsx54(Text53, { color: PALETTE.info, children: "\u2588" })
-  ] });
-}
-function SetupSummary({ outcome, notice }) {
-  const requiredFailed = countRequiredFailures(outcome.results);
-  return /* @__PURE__ */ jsxs53(Box51, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsx54(Text53, { bold: true, children: "Summary" }),
-    outcome.results.map((result) => {
-      if (result.status === "completed") {
-        return /* @__PURE__ */ jsxs53(Text53, { color: PALETTE.success, children: [
-          "\u2713 ",
-          result.name
-        ] }, result.name);
-      }
-      if (result.status === "skipped") {
-        return /* @__PURE__ */ jsxs53(Text53, { dimColor: true, children: [
-          "\u2013 ",
-          result.name,
-          " \u2014 skipped"
-        ] }, result.name);
-      }
-      return /* @__PURE__ */ jsxs53(Text53, { color: result.required ? PALETTE.error : PALETTE.warning, children: [
-        result.required ? "\u2717" : "\u26A0",
-        " ",
-        result.name,
-        " \u2014 ",
-        result.required ? "required" : "optional"
-      ] }, result.name);
-    }),
-    notice && /* @__PURE__ */ jsx54(Box51, { marginTop: 1, children: /* @__PURE__ */ jsx54(Text53, { color: PALETTE.warning, children: notice }) }),
-    /* @__PURE__ */ jsx54(Box51, { marginTop: 1, children: /* @__PURE__ */ jsx54(Text53, { bold: true, color: requiredFailed === 0 ? PALETTE.success : PALETTE.warning, children: formatSetupCompletionMessage(outcome.results) }) }),
-    requiredFailed > 0 && /* @__PURE__ */ jsx54(Text53, { dimColor: true, children: "Complete the steps above, then re-run experiences setup." })
-  ] });
-}
-var STEP_ACTIVITY, SKIP_VALUE;
-var init_SetupScreen = __esm({
-  "packages/experience-design-system-cli/src/setup/tui/SetupScreen.tsx"() {
-    "use strict";
-    init_theme();
-    init_layout();
-    init_prompt_input();
-    init_usePromptInput();
-    init_SetupStepper();
-    init_coding_agent();
-    init_contentful();
-    init_preferences();
-    init_prerequisites();
-    STEP_ACTIVITY = [
-      "Checking prerequisites",
-      "Configuring your coding agent",
-      "Configuring Contentful credentials",
-      "Configuring preferences"
-    ];
-    SKIP_VALUE = "\0skip";
-  }
-});
-
 // packages/experience-design-system-cli/src/program.ts
 import { spawn as spawn6 } from "node:child_process";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
-import { dirname as dirname14, join as join30, resolve as resolve26 } from "node:path";
-import { readFileSync as readFileSync11 } from "node:fs";
+import { dirname as dirname14, join as join28, resolve as resolve27 } from "node:path";
+import { readFileSync as readFileSync10 } from "node:fs";
 import { Command } from "commander";
 
 // packages/experience-design-system-cli/src/analyze/command.ts
 import { createElement as createElement3 } from "react";
 import { render as render3 } from "ink";
-import { mkdir as mkdir3, readdir as readdir2, readFile as readFile16, stat as stat2, writeFile as writeFile3 } from "node:fs/promises";
+import { mkdir as mkdir3, readdir as readdir2, readFile as readFile17, stat as stat2, writeFile as writeFile3 } from "node:fs/promises";
 import { isAbsolute as isAbsolute4, join as join15, relative as relative3, resolve as resolve15 } from "node:path";
 
 // packages/experience-design-system-cli/src/lib/agent-model-options.ts
@@ -31063,6 +30061,104 @@ init_command2();
 // packages/experience-design-system-cli/src/analyze/select-agent/command.ts
 init_db();
 init_cache_keys();
+
+// packages/experience-design-system-cli/src/helpers/read-existing-contentful-entities-from-session.ts
+import { readFile as readFile13 } from "node:fs/promises";
+async function readExistingContentfulEntitiesFromSession(path) {
+  if (!path) return void 0;
+  try {
+    const raw = await readFile13(path, "utf8");
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed.components) || !Array.isArray(parsed.tokens)) return void 0;
+    return parsed;
+  } catch {
+    return void 0;
+  }
+}
+
+// packages/experience-design-system-cli/src/helpers/find-nearly-matching-component.ts
+var MAX_CHARACTER_EDITS_FOR_LIKELY_MATCH = 2;
+function findNearlyMatchingComponent(components, codebaseName) {
+  const target = simplifyNameForComparison(codebaseName);
+  if (!target) return void 0;
+  let best;
+  for (const c2 of components) {
+    const edits = countCharacterEdits(target, simplifyNameForComparison(c2.name));
+    if (edits > MAX_CHARACTER_EDITS_FOR_LIKELY_MATCH) continue;
+    if (!best || edits < best.edits) best = { component: c2, edits };
+    if (edits === 0) break;
+  }
+  return best?.component;
+}
+function simplifyNameForComparison(name) {
+  const stripped = name.toLowerCase().replace(/[^a-z0-9]/g, "");
+  return stripped.endsWith("s") && stripped.length > 1 ? stripped.slice(0, -1) : stripped;
+}
+function countCharacterEdits(a, b) {
+  if (a === b) return 0;
+  if (a.length === 0) return b.length;
+  if (b.length === 0) return a.length;
+  if (a.length > b.length) [a, b] = [b, a];
+  let prev = new Array(a.length + 1);
+  let curr = new Array(a.length + 1);
+  for (let i = 0; i <= a.length; i++) prev[i] = i;
+  for (let j = 1; j <= b.length; j++) {
+    curr[0] = j;
+    for (let i = 1; i <= a.length; i++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+      curr[i] = Math.min(curr[i - 1] + 1, prev[i] + 1, prev[i - 1] + cost);
+    }
+    [prev, curr] = [curr, prev];
+  }
+  return prev[a.length];
+}
+
+// packages/experience-design-system-cli/src/helpers/summarize-existing-contentful-entities.ts
+function summarizeForSelectAgent(entities) {
+  return {
+    components: entities.components.map((c2) => ({
+      id: c2.sys.id,
+      name: c2.name,
+      description: c2.description
+    })),
+    tokens: summarizeTokens(entities.tokens)
+  };
+}
+function summarizeForGenerateAgent(entities, codebaseComponentName) {
+  const match2 = findNearlyMatchingComponent(entities.components, codebaseComponentName);
+  const otherComponents = entities.components.filter((c2) => c2.sys.id !== match2?.sys.id).map((c2) => ({ id: c2.sys.id, name: c2.name }));
+  return {
+    likelyMatch: match2 ? {
+      id: match2.sys.id,
+      name: match2.name,
+      designProperties: match2.designProperties.map((p) => ({
+        id: p.id,
+        name: p.name,
+        type: p.type
+      })),
+      contentProperties: match2.contentProperties.map((p) => ({
+        id: p.id,
+        name: p.name,
+        type: p.type
+      })),
+      slots: (match2.slots ?? []).map((s) => ({ id: s.id, name: s.name }))
+    } : void 0,
+    otherComponents,
+    tokens: summarizeTokens(entities.tokens)
+  };
+}
+function summarizeForMapTokens(entities) {
+  return {
+    tokens: entities.tokens.map((t) => ({ id: t.sys.id, name: t.name, type: t.type }))
+  };
+}
+function summarizeTokens(tokens) {
+  const kinds = /* @__PURE__ */ new Set();
+  for (const t of tokens) kinds.add(t.type);
+  return { count: tokens.length, kinds: [...kinds].sort() };
+}
+
+// packages/experience-design-system-cli/src/analyze/select-agent/command.ts
 init_persistence();
 init_parser();
 init_src();
@@ -31164,7 +30260,7 @@ var OutputFormatter = class {
 };
 
 // packages/experience-design-system-cli/src/analyze/select-agent/context-builder.ts
-import { readFile as readFile13 } from "node:fs/promises";
+import { readFile as readFile14 } from "node:fs/promises";
 import { dirname as dirname10, isAbsolute as isAbsolute2, join as join13, relative as relative2, resolve as resolve11, sep } from "node:path";
 var SCANNED_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".astro", ".js", ".jsx", ".svelte", ".ts", ".tsx", ".vue"]);
 var IMPORT_PATTERN2 = /import\s+(?:type\s+)?(.+?)\s+from\s+['"]([^'"]+)['"]/g;
@@ -31293,7 +30389,7 @@ async function buildRepoContextIndex(root, filePaths) {
         absolutePath,
         relativePath: toPosixPath(relative2(resolvedRoot, absolutePath)),
         directory: dirname10(absolutePath),
-        text: await readFile13(absolutePath, "utf8").catch(() => "")
+        text: await readFile14(absolutePath, "utf8").catch(() => "")
       })
     )
   );
@@ -31506,8 +30602,8 @@ function resolveProjectRoot(sessionId2, projectRootFlag) {
     db.close();
   }
 }
-async function selectBatch(agent, model, batch, total, verbose, skillPathOverride) {
-  const prompt = await buildPrompt({
+async function selectBatch(agent, model, batch, total, verbose, skillPathOverride, existingComponentsInline) {
+  const prompt2 = await buildPrompt({
     skill: "select",
     mode: "autonomous",
     rawComponentsInline: JSON.stringify(
@@ -31516,7 +30612,8 @@ async function selectBatch(agent, model, batch, total, verbose, skillPathOverrid
       2
     ),
     outDir: process.cwd(),
-    skillPathOverride
+    skillPathOverride,
+    existingComponentsInline
   });
   let outputBuf = "";
   const formatter = new OutputFormatter(verbose, (s) => {
@@ -31525,7 +30622,7 @@ async function selectBatch(agent, model, batch, total, verbose, skillPathOverrid
   const result = await invoker.invoke({
     agent,
     model,
-    prompt,
+    prompt: prompt2,
     timeoutMs: DEFAULT_TIMEOUT_MS,
     onOutput: (chunk) => formatter.push(chunk)
   });
@@ -31611,7 +30708,7 @@ ${outputBuf}`);
   }
   return results;
 }
-async function selectAllComponents(agent, model, components, verbose, skillPathOverride, cacheConfig = { noCache: true }) {
+async function selectAllComponents(agent, model, components, verbose, skillPathOverride, existingComponentsInline, cacheConfig = { noCache: true }) {
   const concurrency = Number(process.env.EDS_GENERATE_CONCURRENCY ?? DEFAULT_CONCURRENCY);
   const batchSize = resolveBatchSize();
   const total = components.length;
@@ -31620,7 +30717,13 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
   let cliVersion2 = "";
   if (!cacheConfig.noCache) {
     try {
-      promptHash = await hashPromptForSkill("select", agent, model, skillPathOverride);
+      promptHash = await hashPromptForSkill(
+        "select",
+        agent,
+        model,
+        skillPathOverride,
+        existingComponentsInline ? [hashContent(existingComponentsInline)] : []
+      );
       cliVersion2 = await getCliCacheVersion();
       const db = openPipelineDb(cacheConfig.dbPath);
       try {
@@ -31676,7 +30779,15 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
     while (nextBatch < batches.length) {
       const b = nextBatch++;
       const batch = batches[b];
-      const batchResults = await selectBatch(agent, model, batch, total, verbose, skillPathOverride);
+      const batchResults = await selectBatch(
+        agent,
+        model,
+        batch,
+        total,
+        verbose,
+        skillPathOverride,
+        existingComponentsInline
+      );
       for (let k = 0; k < batch.length; k++) {
         results[batch[k].index] = batchResults[k];
       }
@@ -31712,6 +30823,9 @@ function registerAnalyzeSelectAgentCommand(program) {
     "--select-prompt-path <path>",
     "Path to a custom .md skill prompt for select-agent (bypasses bundled prompt invariants)"
   ).option("--no-select-cache", "Skip the per-component select cache and re-LLM every component").option("--no-cache", "Skip ALL fine-grained caches (extract, select, generate)").option(
+    "--existing-entities-path <path>",
+    "Path to the .existing-entities.json file written by the orchestrator when CMA credentials are supplied. When present, the agent gets an existing-components summary to align rejection/acceptance reasoning with the target space. Missing/malformed files are treated as no-op."
+  ).option(
     "--show-rationale",
     "Read-only: print the AI rejection rationale persisted by a prior select-agent run and exit. No LLM call. Combine with --json for machine-readable output."
   ).option("--json", "When used with --show-rationale, emit a JSON array instead of a human-readable table").action(
@@ -31820,6 +30934,20 @@ function registerAnalyzeSelectAgentCommand(program) {
           }));
         }
       }
+      let existingComponentsInline;
+      if (opts.existingEntitiesPath) {
+        const existingContentfulEntities = await readExistingContentfulEntitiesFromSession(
+          resolve12(opts.existingEntitiesPath)
+        );
+        if (existingContentfulEntities) {
+          existingComponentsInline = JSON.stringify(summarizeForSelectAgent(existingContentfulEntities));
+        } else {
+          process.stderr.write(
+            `warn: --existing-entities-path ${opts.existingEntitiesPath} could not be read as JSON \u2014 proceeding without space-context enrichment
+`
+          );
+        }
+      }
       if (opts.dryRun) {
         if (selectionCandidates.length === 0) {
           process.stderr.write(
@@ -31829,14 +30957,15 @@ function registerAnalyzeSelectAgentCommand(program) {
           return;
         }
         const first = selectionCandidates[0];
-        const prompt = await buildPrompt({
+        const prompt2 = await buildPrompt({
           skill: "select",
           mode: "autonomous",
           rawComponentsInline: JSON.stringify([buildComponentData(first)], null, 2),
           outDir: process.cwd(),
-          skillPathOverride: selectPromptPath ? resolve12(selectPromptPath) : void 0
+          skillPathOverride: selectPromptPath ? resolve12(selectPromptPath) : void 0,
+          existingComponentsInline
         });
-        process.stdout.write(prompt + "\n");
+        process.stdout.write(prompt2 + "\n");
         await exitWithAnalytics(0);
         return;
       }
@@ -31847,6 +30976,7 @@ function registerAnalyzeSelectAgentCommand(program) {
         selectionCandidates,
         opts.verbose ?? false,
         selectPromptPath ? resolve12(selectPromptPath) : void 0,
+        existingComponentsInline,
         { noCache }
       );
       const decisions = /* @__PURE__ */ new Map();
@@ -32195,8 +31325,8 @@ async function resolveMapping(input) {
   const residueParents = input.components.map((c2) => c2.name).filter((n) => !coveredParents.has(n));
   const shouldRunAgent = (input.useAgent || input.forceAgent) && (input.forceAgent || residueParents.length > 0);
   if (shouldRunAgent) {
-    const prompt = input.buildPrompt ? input.buildPrompt(input.files, [...componentNames]) : defaultPrompt(input.files, [...componentNames], input.promptOverride);
-    const raw = await input.runAgentFn({ prompt, files: input.files });
+    const prompt2 = input.buildPrompt ? input.buildPrompt(input.files, [...componentNames]) : defaultPrompt(input.files, [...componentNames], input.promptOverride);
+    const raw = await input.runAgentFn({ prompt: prompt2, files: input.files });
     const parsed = parseMapEdges(raw, { componentNames });
     collected.push(...parsed.edges);
     agentWarnings.push(...parsed.warnings);
@@ -32234,11 +31364,11 @@ ${f.content}`).join("\n\n");
 }
 
 // packages/experience-design-system-cli/src/analyze/composition/resolve-mapping-cli.ts
-import { readFile as readFile14 } from "node:fs/promises";
+import { readFile as readFile15 } from "node:fs/promises";
 async function loadUserMap(path) {
   let text;
   try {
-    text = await readFile14(path, "utf8");
+    text = await readFile15(path, "utf8");
   } catch {
     return { ok: false, error: `--composition-map: file not found: ${path}` };
   }
@@ -32474,16 +31604,16 @@ var HEAP_CAP_MB = 128;
 var MAX_INPUT_BYTES = 8 * 1024 * 1024;
 function runParserInSandbox(source, ctx, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     let input;
     try {
       input = JSON.stringify({ source, ctx, timeoutMs });
     } catch {
-      resolve27({ edges: [], error: "ctx is not serializable" });
+      resolve28({ edges: [], error: "ctx is not serializable" });
       return;
     }
     if (input.length > MAX_INPUT_BYTES) {
-      resolve27({ edges: [], error: "parser input exceeds size limit" });
+      resolve28({ edges: [], error: "parser input exceeds size limit" });
       return;
     }
     let settled = false;
@@ -32515,7 +31645,7 @@ function runParserInSandbox(source, ctx, opts = {}) {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve27(r);
+      resolve28(r);
     };
     const timer = setTimeout(
       () => done({ edges: [], error: `parser timed out after ${timeoutMs}ms` }),
@@ -32676,9 +31806,9 @@ async function resolveViaAgentParser(input) {
     }
     return out;
   };
-  const attempt = async (prompt) => {
+  const attempt = async (prompt2) => {
     input.onPhase?.("authoring");
-    const raw = await input.runAgentFn({ prompt });
+    const raw = await input.runAgentFn({ prompt: prompt2 });
     const source = extractParserSource(raw);
     if (source === null)
       return { error: "agent output had no parser-shaped code block (expected `export default function (ctx) {\u2026}`)" };
@@ -32727,7 +31857,7 @@ ${loadPrompt("composition-parser-repair-error.md").trim().replace("{{error}}", f
 }
 
 // packages/experience-design-system-cli/src/lib/prompt-overrides.ts
-import { readFile as readFile15 } from "node:fs/promises";
+import { readFile as readFile16 } from "node:fs/promises";
 import { resolve as resolve14 } from "node:path";
 var PROMPT_FILE_EXTENSIONS = [".md", ".txt", ".prompt"];
 function looksLikePath(value) {
@@ -32763,7 +31893,7 @@ async function resolvePromptOverride(override) {
   if (override.kind === "text") return override.value;
   const abs = resolve14(override.value);
   try {
-    return await readFile15(abs, "utf8");
+    return await readFile16(abs, "utf8");
   } catch {
     throw new Error(`--prompt: could not read prompt file: ${abs}`);
   }
@@ -32946,7 +32076,7 @@ async function readCandidateFiles(components, extraFiles = []) {
   await Promise.all(
     [...paths].map(async (p) => {
       try {
-        const content = await readFile16(p, "utf8");
+        const content = await readFile17(p, "utf8");
         out.push({ path: p, content });
       } catch {
       }
@@ -33137,10 +32267,10 @@ function registerAnalyzeCommand(program) {
         const componentNameSet = new Set(validatedComponents.map((c2) => c2.name));
         const cacheVersion = await getCliCacheVersion();
         let lastAgentExitCode = 0;
-        const spawnAgent = async (prompt) => {
+        const spawnAgent = async (prompt2) => {
           const res = await runAgent({
             agent: resolverAgent,
-            prompt,
+            prompt: prompt2,
             timeoutMs: 12e4,
             promptViaStdin: true,
             onDebugEvent: (name, payload) => getDebugLogger().event("agent", name, payload)
@@ -33192,7 +32322,7 @@ function registerAnalyzeCommand(program) {
               files: promptFiles,
               runtimeFiles,
               componentNames: componentNameSet,
-              runAgentFn: ({ prompt }) => spawnAgent(prompt),
+              runAgentFn: ({ prompt: prompt2 }) => spawnAgent(prompt2),
               ...compositionPrompt ? { instructionOverride: compositionPrompt } : {},
               onPhase: (phase) => emitCompositionProgress(phase),
               // The candidate filter selected these files because they carry
@@ -33236,7 +32366,7 @@ function registerAnalyzeCommand(program) {
           forceAgent: sources.forceAgent && useEdgeEmission,
           files: promptFiles,
           ...compositionPrompt ? { promptOverride: compositionPrompt } : {},
-          runAgentFn: async ({ prompt }) => {
+          runAgentFn: async ({ prompt: prompt2 }) => {
             if (!opts.compositionRefresh) {
               const cached = lookupCompositionCache(db, agentCacheKey, cacheVersion);
               if (cached !== null) {
@@ -33245,7 +32375,7 @@ function registerAnalyzeCommand(program) {
               }
             }
             emitCompositionProgress(`agent:${resolverAgent}`);
-            const stdout = await spawnAgent(prompt);
+            const stdout = await spawnAgent(prompt2);
             if (lastAgentExitCode === 0) {
               storeCompositionCache(db, agentCacheKey, cacheVersion, stdout);
             }
@@ -33350,7 +32480,7 @@ function registerAnalyzeCommand(program) {
 init_src();
 import { createElement as createElement4 } from "react";
 import { render as render4 } from "ink";
-import { access as access6, readFile as readFile18, readdir as readdir3, stat as stat3 } from "node:fs/promises";
+import { access as access6, readFile as readFile19, readdir as readdir3, stat as stat3 } from "node:fs/promises";
 import { join as join16, resolve as resolve17 } from "node:path";
 init_debug_logger();
 
@@ -33391,7 +32521,7 @@ function GenerateView({ result, onExit }) {
 }
 
 // packages/experience-design-system-cli/src/generate/edit/command.ts
-import { readFile as readFile17 } from "node:fs/promises";
+import { readFile as readFile18 } from "node:fs/promises";
 import { resolve as resolve16 } from "node:path";
 var SAFE_PATH_RE2 = /^[a-zA-Z0-9_.$[\]=]+$/;
 var PROTO_KEYS2 = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
@@ -33474,7 +32604,7 @@ async function runNonInteractive2(opts, skill) {
   if (opts.patch) {
     let patchOps;
     try {
-      const raw = await readFile17(resolve16(opts.patch), "utf8");
+      const raw = await readFile18(resolve16(opts.patch), "utf8");
       patchOps = JSON.parse(raw);
     } catch {
       process.stderr.write(`Error: cannot read or parse --patch file: ${opts.patch}
@@ -33568,7 +32698,7 @@ async function readFileInline(path) {
   } catch {
     return void 0;
   }
-  if (!s.isDirectory()) return readFile18(resolved, "utf8");
+  if (!s.isDirectory()) return readFile19(resolved, "utf8");
   const files = [];
   async function walk(dir) {
     let entries;
@@ -33594,7 +32724,7 @@ async function readFileInline(path) {
   }
   await walk(resolved);
   if (files.length === 0) return void 0;
-  const parts = await Promise.all(files.map((f) => readFile18(f, "utf8").catch(() => "")));
+  const parts = await Promise.all(files.map((f) => readFile19(f, "utf8").catch(() => "")));
   return parts.filter(Boolean).join("\n\n");
 }
 function printFallbackInstructions(options) {
@@ -33616,7 +32746,7 @@ function printFallbackInstructions(options) {
   lines.push(`  Re-run the generate command with the agent available, or use --dry-run to inspect the prompt.`);
   process.stderr.write(lines.join("\n") + "\n");
 }
-async function runOneComponent(agent, model, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash) {
+async function runOneComponent(agent, model, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash, existingContentfulEntities, existingTokensInline) {
   const pos = c.dim(`[${index + 1}/${total}]`);
   if (!noCache) {
     const inputHash = computeComponentInputHash(component);
@@ -33686,7 +32816,8 @@ async function runOneComponent(agent, model, db, sessionId2, component, tokensIn
     component.props.map((p) => p.name),
     component.props.map((p) => p.type)
   );
-  const prompt = await buildPrompt({
+  const existingComponentsInline = existingContentfulEntities ? JSON.stringify(summarizeForGenerateAgent(existingContentfulEntities, component.name)) : void 0;
+  const prompt2 = await buildPrompt({
     skill: "components",
     mode: "autonomous",
     rawComponentsInline,
@@ -33695,7 +32826,9 @@ async function runOneComponent(agent, model, db, sessionId2, component, tokensIn
     outDir: process.cwd(),
     componentName: component.name,
     componentSourceRefs: [sourceRef],
-    skillPathOverride
+    skillPathOverride,
+    existingComponentsInline,
+    existingTokensInline
   });
   const maxAttempts = 2;
   let lastError = "";
@@ -33708,7 +32841,7 @@ async function runOneComponent(agent, model, db, sessionId2, component, tokensIn
     const result = await invoker2.invoke({
       agent,
       model,
-      prompt,
+      prompt: prompt2,
       timeoutMs: DEFAULT_TIMEOUT_MS3,
       onOutput: (chunk) => formatter.push(chunk)
     });
@@ -33763,7 +32896,7 @@ ${outputBuf}`);
     renamedSlotsCount: renames.length
   };
 }
-async function runAllComponents(agent, model, db, sessionId2, components, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, promptHash) {
+async function runAllComponents(agent, model, db, sessionId2, components, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, promptHash, existingContentfulEntities, existingTokensInline) {
   const concurrency = Number(process.env.EDS_GENERATE_CONCURRENCY ?? DEFAULT_COMPONENT_CONCURRENCY);
   process.stderr.write(
     `Categorizing ${c.bold(String(components.length))} component${components.length === 1 ? "" : "s"}` + c.dim(`  (concurrency: ${concurrency})`) + "\n"
@@ -33787,7 +32920,9 @@ async function runAllComponents(agent, model, db, sessionId2, components, tokens
         verbose,
         noCache,
         skillPathOverride,
-        promptHash
+        promptHash,
+        existingContentfulEntities,
+        existingTokensInline
       );
       completed += 1;
       process.stderr.write(`${formatGenerateProgressLine(completed, components.length, results[i].componentName)}
@@ -33825,7 +32960,7 @@ async function loadAcceptedNames(sessionId2) {
   try {
     const artifactsRoot = getRefineArtifactsRoot();
     const paths = await getRefineSessionPaths(sessionId2, artifactsRoot);
-    const raw = await readFile18(paths.statePath, "utf8");
+    const raw = await readFile19(paths.statePath, "utf8");
     const snapshot = JSON.parse(raw);
     const accepted = snapshot.components.filter((c2) => c2.status === "accepted").map((c2) => c2.name);
     if (accepted.length === 0) return null;
@@ -33871,6 +33006,19 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     readFileInline(opts.tokens),
     readFileInline(opts.tokenMap)
   ]);
+  let existingContentfulEntities;
+  let existingTokensInline;
+  if (opts.existingEntitiesPath) {
+    existingContentfulEntities = await readExistingContentfulEntitiesFromSession(resolve17(opts.existingEntitiesPath));
+    if (existingContentfulEntities) {
+      existingTokensInline = JSON.stringify(summarizeForMapTokens(existingContentfulEntities));
+    } else {
+      process.stderr.write(
+        `warn: --existing-entities-path ${opts.existingEntitiesPath} could not be read as JSON \u2014 proceeding without space-context enrichment
+`
+      );
+    }
+  }
   let sessionId2;
   let allComponents;
   if (skill === "components") {
@@ -33931,7 +33079,8 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       sampleComponent.props.map((p) => p.name),
       sampleComponent.props.map((p) => p.type)
     ) : void 0;
-    const prompt = await buildPrompt({
+    const dryRunExistingComponentsInline = skill === "components" && existingContentfulEntities && sampleComponent ? JSON.stringify(summarizeForGenerateAgent(existingContentfulEntities, sampleComponent.name)) : void 0;
+    const prompt2 = await buildPrompt({
       skill,
       mode: "autonomous",
       rawComponentsInline: sampleInline ?? rawTokensInline,
@@ -33941,9 +33090,11 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       tokenMapInline,
       outDir: process.cwd(),
       componentSourceRefs: sampleSourceRef ? [sampleSourceRef] : void 0,
-      skillPathOverride: generatePromptPath
+      skillPathOverride: generatePromptPath,
+      existingComponentsInline: dryRunExistingComponentsInline,
+      existingTokensInline: skill === "components" ? existingTokensInline : void 0
     });
-    process.stdout.write(prompt + "\n");
+    process.stdout.write(prompt2 + "\n");
     await exitWithAnalytics(0);
   }
   const binary = resolveBinary(agent);
@@ -33959,7 +33110,15 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     const db = openPipelineDb();
     let componentResults;
     try {
-      const promptHash = await hashPromptForSkill("components", agent, model, generatePromptPath);
+      const existingContentfulEntitiesHashInputs = [];
+      if (existingTokensInline) existingContentfulEntitiesHashInputs.push(hashContent(existingTokensInline));
+      const promptHash = await hashPromptForSkill(
+        "components",
+        agent,
+        model,
+        generatePromptPath,
+        existingContentfulEntitiesHashInputs
+      );
       componentResults = await runAllComponents(
         agent,
         model,
@@ -33971,7 +33130,9 @@ async function runGenerateSkill(skill, opts, verbose = false) {
         verbose,
         opts.cache === false || process.env.EDS_NO_CACHE === "1",
         generatePromptPath,
-        promptHash
+        promptHash,
+        existingContentfulEntities,
+        existingTokensInline
       );
     } finally {
       db.close();
@@ -34063,7 +33224,7 @@ session=${sessionId2 ?? ""}
           return;
         }
       }
-      const prompt = await buildPrompt({
+      const prompt2 = await buildPrompt({
         skill,
         mode: "autonomous",
         rawTokensInline,
@@ -34075,7 +33236,7 @@ session=${sessionId2 ?? ""}
       const result = await invoker2.invoke({
         agent,
         model,
-        prompt,
+        prompt: prompt2,
         timeoutMs: DEFAULT_TIMEOUT_MS3 * 5
       });
       if (result.timedOut) {
@@ -34148,6 +33309,9 @@ function registerGenerateCommand(program) {
   const componentsCmd = generate.command("components").description("Invoke a coding agent to produce components.json from raw analysis output").option("--session <id>", "Session ID from analyze extract (defaults to most recent)").option("--tokens <path>", "Path to tokens.json for token-linked prop resolution").option("--token-map <path>", "Path to token-name-map.json sidecar").option(
     "--generate-prompt-path <path>",
     "Path to a custom .md skill prompt for components generation (bypasses bundled prompt invariants)"
+  ).option(
+    "--existing-entities-path <path>",
+    "Path to the .existing-entities.json file written by the orchestrator when CMA credentials are supplied. When present, per-component prompts include a summary of the target space so classifications can align to existing prop names/tokens. Missing/malformed files are treated as no-op."
   );
   addAgentFlags(componentsCmd).action(async (opts) => {
     await runGenerateSkill("components", opts, opts.verbose ?? false);
@@ -34594,9 +33758,9 @@ ${"\u2500".repeat(60)}
 `);
       }
       process.stdout.write("\nDelete these sessions? (y/N) ");
-      const answer = await new Promise((resolve27) => {
+      const answer = await new Promise((resolve28) => {
         process.stdin.setEncoding("utf8");
-        process.stdin.once("data", (chunk) => resolve27(String(chunk).trim().toLowerCase()));
+        process.stdin.once("data", (chunk) => resolve28(String(chunk).trim().toLowerCase()));
       });
       if (answer !== "y") {
         db.close();
@@ -34631,7 +33795,7 @@ import { access as access7, mkdir as mkdir4, stat as stat4, writeFile as writeFi
 import { basename as basename5, resolve as resolve19 } from "node:path";
 
 // packages/experience-design-system-cli/src/print/validate/validators/cdf-validator.ts
-import { readFile as readFile19 } from "node:fs/promises";
+import { readFile as readFile20 } from "node:fs/promises";
 import { validateCDF as validateCDF2 } from "@contentful/experience-design-system-types";
 function extractValue(input, path) {
   if (path === "/") return void 0;
@@ -34690,7 +33854,7 @@ function rewriteDiagnostic(error, input) {
 async function validateCDFFile(filePath) {
   let content;
   try {
-    content = await readFile19(filePath, "utf-8");
+    content = await readFile20(filePath, "utf-8");
   } catch (err) {
     return {
       valid: false,
@@ -34725,7 +33889,7 @@ async function validateCDFFile(filePath) {
 }
 
 // packages/experience-design-system-cli/src/print/validate/validators/dtcg-validator.ts
-import { readFile as readFile20 } from "node:fs/promises";
+import { readFile as readFile21 } from "node:fs/promises";
 import { DESIGN_TOKEN_TYPES } from "@contentful/experience-design-system-types";
 function walkDTCG(obj, path, diagnostics, counts) {
   for (const [key, value] of Object.entries(obj)) {
@@ -34770,7 +33934,7 @@ function walkDTCG(obj, path, diagnostics, counts) {
 async function validateDTCGTokenFile(filePath) {
   let content;
   try {
-    content = await readFile20(filePath, "utf-8");
+    content = await readFile21(filePath, "utf-8");
   } catch (err) {
     return {
       valid: false,
@@ -35103,7 +34267,8 @@ init_db();
 init_cache_keys();
 import { createElement as createElement6 } from "react";
 import { render as render6 } from "ink";
-import { readFile as readFile21 } from "node:fs/promises";
+import { readFile as readFile22 } from "node:fs/promises";
+import { resolve as resolve20 } from "node:path";
 
 // packages/experience-design-system-cli/src/map-tokens/apply.ts
 init_db();
@@ -35351,7 +34516,7 @@ async function runMapTokens(opts) {
     const knownTokenPaths = new Set(tokenLeaves.map((t) => t.path));
     const tokenMapDiagnostics = [];
     if (opts.tokenMap) {
-      const fileMappings = JSON.parse(await readFile21(opts.tokenMap, "utf8"));
+      const fileMappings = JSON.parse(await readFile22(opts.tokenMap, "utf8"));
       const validMappings = {};
       for (const [rawName, path] of Object.entries(fileMappings)) {
         if (knownTokenPaths.has(path)) {
@@ -35426,16 +34591,31 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
     const generatedCdf = Object.fromEntries(cdfEntries.map((c2) => [c2.key, c2.entry]));
     const tokenTree = rebuildDTCGTree(groups, tokens);
     const componentSourceRefs = await loadComponentSourceRefs(db, sessionId2);
+    let existingTokensInline;
+    if (opts.existingEntitiesPath) {
+      const existingContentfulEntities = await readExistingContentfulEntitiesFromSession(
+        resolve20(opts.existingEntitiesPath)
+      );
+      if (existingContentfulEntities) {
+        existingTokensInline = JSON.stringify(summarizeForMapTokens(existingContentfulEntities));
+      } else {
+        process.stderr.write(
+          `warn: --existing-entities-path ${opts.existingEntitiesPath} could not be read as JSON \u2014 proceeding without space-context enrichment
+`
+        );
+      }
+    }
     if (opts.printPrompt) {
-      const prompt2 = await buildPrompt({
+      const prompt3 = await buildPrompt({
         skill: "map-tokens",
         mode: "autonomous",
         generatedCdf,
         tokenTree,
         componentSourceRefs,
-        outDir: process.cwd()
+        outDir: process.cwd(),
+        existingTokensInline
       });
-      process.stdout.write(prompt2 + "\n");
+      process.stdout.write(prompt3 + "\n");
       await exitWithAnalytics(0);
       return;
     }
@@ -35451,7 +34631,13 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
     }
     const agent = configuredAgent;
     const noCache = opts.cache === false || process.env.EDS_NO_CACHE === "1";
-    const promptHash = await hashPromptForSkill("map-tokens", agent, model);
+    const promptHash = await hashPromptForSkill(
+      "map-tokens",
+      agent,
+      model,
+      void 0,
+      existingTokensInline ? [hashContent(existingTokensInline)] : []
+    );
     const inputHash = computeMapTokensInputHash(db, sessionId2, componentSourceRefs);
     if (!noCache) {
       const cached = lookupCache(db, inputHash, "token_mapping", "__map_tokens__", promptHash);
@@ -35472,16 +34658,17 @@ Install it, choose another agent with --agent, or use --print-prompt to run the
       );
     }
     const stepId = createStep(db, sessionId2, "map tokens", { agent, model: model ?? "" });
-    const prompt = await buildPrompt({
+    const prompt2 = await buildPrompt({
       skill: "map-tokens",
       mode: "autonomous",
       generatedCdf,
       tokenTree,
       componentSourceRefs,
-      outDir: process.cwd()
+      outDir: process.cwd(),
+      existingTokensInline
     });
     const invoker3 = createLocalCliAgentInvoker();
-    const result = await invoker3.invoke({ agent, model, prompt, timeoutMs: DEFAULT_TIMEOUT_MS4 });
+    const result = await invoker3.invoke({ agent, model, prompt: prompt2, timeoutMs: DEFAULT_TIMEOUT_MS4 });
     if (result.timedOut || result.exitCode !== 0) {
       const error = result.timedOut ? `timed out after ${DEFAULT_TIMEOUT_MS4 / 6e4} minutes` : describeAgentFailure(result);
       updateStep(db, stepId, "failed", {}, error);
@@ -35505,7 +34692,10 @@ ${warnings.map((w) => `  ${w}`).join("\n")}
 }
 function registerMapTokensCommand(program) {
   const map = program.command("map").description("Suggest token restrictions for generated design-token props");
-  const tokensCmd = map.command("tokens").description("Invoke a coding agent to suggest $token.allowed for design-category token props").option("--session <id>", "Session ID from generate components (defaults to most recent)").option("--print-prompt", "Print the prompt without invoking the agent").option("--skip-agent", "Resolve token defaults without agentic $token.allowed inference").option("--no-cache", "Bypass the map-tokens cache and force a re-run").option("--token-map <path>", "Path to token-name-map.json sidecar");
+  const tokensCmd = map.command("tokens").description("Invoke a coding agent to suggest $token.allowed for design-category token props").option("--session <id>", "Session ID from generate components (defaults to most recent)").option("--print-prompt", "Print the prompt without invoking the agent").option("--skip-agent", "Resolve token defaults without agentic $token.allowed inference").option("--no-cache", "Bypass the map-tokens cache and force a re-run").option("--token-map <path>", "Path to token-name-map.json sidecar").option(
+    "--existing-entities-path <path>",
+    "Path to the .existing-entities.json file written by the orchestrator when CMA credentials are supplied. When present, the agent gets a list of the space's existing design tokens so it can prefer binding to them. Missing/malformed files are treated as no-op."
+  );
   addAgentModelOptions(tokensCmd).action(async (opts) => {
     await runMapTokens(opts);
   });
@@ -35514,45 +34704,22 @@ function registerMapTokensCommand(program) {
 // packages/experience-design-system-cli/src/import/command.ts
 init_src();
 init_path_utils();
-import { resolve as resolve25, join as join25 } from "node:path";
+import { resolve as resolve26, join as join26 } from "node:path";
 
 // packages/experience-design-system-cli/src/import/orchestrator.ts
 init_db();
 init_command();
 init_manifest();
 init_api_client();
-import { mkdir as mkdir5, writeFile as writeFile5 } from "node:fs/promises";
-import { join as join18, resolve as resolve21 } from "node:path";
-import { execFile as execFile2 } from "node:child_process";
-
-// packages/experience-design-system-cli/src/helpers/fetch-existing-entities.ts
-import { fetchAll } from "contentful-management";
-async function fetchExistingEntities(client2, params) {
-  const scope = { spaceId: params.spaceId, environmentId: params.environmentId, query: {} };
-  const components = await fetchAll(client2.component.getMany, scope);
-  const tokens = await fetchAll(client2.designToken.getMany, scope);
-  return { components, tokens };
-}
-
-// packages/experience-design-system-cli/src/helpers/cma-client.ts
-init_host_utils();
-import { createClient as createClient2 } from "contentful-management";
-function createCmaClient(opts) {
-  return createClient2(
-    {
-      accessToken: opts.cmaToken,
-      ...opts.host ? { host: toConfiguredHost(opts.host) } : {}
-    },
-    { type: "plain" }
-  );
-}
-
-// packages/experience-design-system-cli/src/import/orchestrator.ts
+init_fetch_and_persist_existing_contentful_entities();
 init_contentful_urls();
 init_debug_logger();
 init_analytics();
 init_env();
 init_cli_path();
+import { mkdir as mkdir5 } from "node:fs/promises";
+import { join as join19, resolve as resolve22 } from "node:path";
+import { execFile as execFile2 } from "node:child_process";
 async function runStep(args, cliPath, analyticsSessionId, env = {}, streamStderr = false) {
   const debug = getDebugLogger();
   const startedAt = Date.now();
@@ -35637,9 +34804,9 @@ function buildPushStepResult(args) {
   };
 }
 async function runPipeline(opts, progressWriter, cliPathOverride) {
-  const projectRoot = resolve21(opts.project);
-  const outDir = resolve21(opts.out);
-  const componentsPath = join18(outDir, "components.json");
+  const projectRoot = resolve22(opts.project);
+  const outDir = resolve22(opts.out);
+  const componentsPath = join19(outDir, "components.json");
   const cliPath = cliPathOverride ?? findCliPath();
   const db = openPipelineDb();
   const { sessionId: sessionId2 } = getOrCreateSession(db, void 0, void 0, {
@@ -35660,67 +34827,56 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
   await mkdir5(outDir, { recursive: true });
   const steps = [];
   let stepNum = 0;
-  const wantsSpaceContext = opts.withSpaceContext === true;
-  const canFetchSpaceContext = wantsSpaceContext && !!opts.spaceId && !!opts.environmentId && !!opts.cmaToken;
-  const totalSteps = 5 + (opts.print ? 1 : 0) + (canFetchSpaceContext ? 1 : 0);
+  const canFetchExistingContentfulEntities = !!opts.spaceId && !!opts.environmentId && !!opts.cmaToken;
+  const totalSteps = 5 + (opts.print ? 1 : 0) + (canFetchExistingContentfulEntities ? 1 : 0);
   function stepLabel(name) {
     stepNum++;
     return `  Step ${stepNum}/${totalSteps}  ${name}  `;
   }
-  if (wantsSpaceContext && !canFetchSpaceContext) {
-    progressWriter(
-      "  Note: --with-space-context requires --space-id, --environment-id, and --cma-token; skipping context fetch."
-    );
-  }
-  if (canFetchSpaceContext) {
+  let existingEntitiesPath;
+  if (canFetchExistingContentfulEntities) {
     const fetchLabel = stepLabel("Fetching existing components + design tokens");
     const fetchStepId = createStep(db, sessionId2, "fetch existing entities", {
       spaceId: opts.spaceId,
       environmentId: opts.environmentId
     });
-    const t0 = Date.now();
-    try {
-      const cmaClient = createCmaClient({
-        cmaToken: opts.cmaToken,
-        ...opts.host ? { host: opts.host } : {}
-      });
-      const existingComponentsAndTokens = await fetchExistingEntities(cmaClient, {
-        spaceId: opts.spaceId,
-        environmentId: opts.environmentId
-      });
-      const fetchDurationMs = Date.now() - t0;
-      const existingEntitiesPath = join18(outDir, ".existing-entities.json");
-      await writeFile5(existingEntitiesPath, JSON.stringify(existingComponentsAndTokens, null, 2), "utf8");
+    const result = await fetchAndPersistExistingContentfulEntities({
+      spaceId: opts.spaceId,
+      environmentId: opts.environmentId,
+      cmaToken: opts.cmaToken,
+      ...opts.host ? { host: opts.host } : {},
+      outDir
+    });
+    if (result.ok) {
+      existingEntitiesPath = result.path;
       updateStep(db, fetchStepId, "complete", {
-        components: String(existingComponentsAndTokens.components.length),
-        tokens: String(existingComponentsAndTokens.tokens.length),
-        path: existingEntitiesPath
+        components: String(result.entities.components.length),
+        tokens: String(result.entities.tokens.length),
+        path: result.path
       });
       progressWriter(
-        `${fetchLabel}\u2713  ${existingComponentsAndTokens.components.length} component${existingComponentsAndTokens.components.length === 1 ? "" : "s"}, ${existingComponentsAndTokens.tokens.length} token${existingComponentsAndTokens.tokens.length === 1 ? "" : "s"}  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+        `${fetchLabel}\u2713  ${result.entities.components.length} component${result.entities.components.length === 1 ? "" : "s"}, ${result.entities.tokens.length} token${result.entities.tokens.length === 1 ? "" : "s"}  (${(result.durationMs / 1e3).toFixed(1)}s)`
       );
       steps.push({
         step: "fetch existing entities",
         status: "complete",
-        durationMs: fetchDurationMs,
+        durationMs: result.durationMs,
         detail: {
-          components: existingComponentsAndTokens.components.length,
-          tokens: existingComponentsAndTokens.tokens.length
+          components: result.entities.components.length,
+          tokens: result.entities.tokens.length
         }
       });
-    } catch (error) {
-      const fetchDurationMs = Date.now() - t0;
-      const message = error instanceof Error ? error.message : String(error);
-      updateStep(db, fetchStepId, "complete", {}, message);
+    } else {
+      updateStep(db, fetchStepId, "complete", {}, result.error);
       progressWriter(
-        `${fetchLabel}\u26A0  fetch failed, continuing without space context  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+        `${fetchLabel}\u26A0  fetch failed, continuing without space context  (${(result.durationMs / 1e3).toFixed(1)}s)`
       );
-      progressWriter(`    ${message.split("\n")[0]}`);
+      progressWriter(`    ${result.error.split("\n")[0]}`);
       steps.push({
         step: "fetch existing entities",
         status: "skipped",
-        durationMs: fetchDurationMs,
-        reason: `fetch failed: ${message.split("\n")[0]}`
+        durationMs: result.durationMs,
+        reason: `fetch failed: ${result.error.split("\n")[0]}`
       });
     }
   }
@@ -35806,6 +34962,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
       if (opts.excludeInvalid) editArgs.push("--exclude-invalid");
       if (opts.noCache) editArgs.push("--no-cache");
       if (opts.selectPromptPath) editArgs.push("--select-prompt-path", opts.selectPromptPath);
+      if (existingEntitiesPath) editArgs.push("--existing-entities-path", existingEntitiesPath);
     } else {
       editArgs = ["analyze", "select", "--session", extractSessionId];
       if (opts.select && opts.select.length > 0) {
@@ -35868,6 +35025,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     if (extractSessionId) generateArgs.push("--session", extractSessionId);
     if (opts.dryRun) generateArgs.push("--dry-run");
     if (opts.verbose) generateArgs.push("--verbose");
+    if (existingEntitiesPath) generateArgs.push("--existing-entities-path", existingEntitiesPath);
     const stepId = createStep(db, sessionId2, "generate components", {
       extractSession: extractSessionId ?? ""
     });
@@ -35922,6 +35080,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     if (opts.model) mapTokensArgs.push("--model", opts.model);
     if (opts.noCache) mapTokensArgs.push("--no-cache");
     if (opts.skipMapTokens) mapTokensArgs.push("--skip-agent");
+    if (existingEntitiesPath) mapTokensArgs.push("--existing-entities-path", existingEntitiesPath);
     const mapTokensStepId = createStep(db, sessionId2, "map tokens", {
       extractSession: extractSessionId,
       skipAgent: String(opts.skipMapTokens === true)
@@ -36283,7 +35442,7 @@ init_host_utils();
 // packages/experience-design-system-cli/src/runs/replay-helpers.ts
 init_resolve_run_target();
 init_store();
-import { resolve as resolve24 } from "node:path";
+import { resolve as resolve25 } from "node:path";
 
 // packages/experience-design-system-cli/src/runs/push-helpers.ts
 init_cli_path();
@@ -36390,7 +35549,7 @@ async function replayRun(opts) {
     if (!opts.interactive) {
       throw new Error(MISSING_CREDS_ERROR);
     }
-    const prompt = opts.promptForCredentials ?? (async (need) => {
+    const prompt2 = opts.promptForCredentials ?? (async (need) => {
       const { promptForPushCredentials: promptForPushCredentials2 } = await Promise.resolve().then(() => (init_push_creds_prompt(), push_creds_prompt_exports));
       return promptForPushCredentials2({
         ...need.spaceId ? { initialSpaceId: need.spaceId } : {},
@@ -36400,7 +35559,7 @@ async function replayRun(opts) {
         summary: `Push run ${run.id} \u2192 enter credentials. Defaults reflect the run record and your saved setup.`
       });
     });
-    const collected = await prompt({
+    const collected = await prompt2({
       spaceId,
       environmentId,
       cmaToken,
@@ -36473,7 +35632,7 @@ async function modifyRun(opts) {
     entryStep: "final-review",
     saveMode,
     ...run.compositionMode ? { compositionMode: run.compositionMode } : {},
-    ...opts.outDir ? { outDirOverride: resolve24(opts.outDir) } : {},
+    ...opts.outDir ? { outDirOverride: resolve25(opts.outDir) } : {},
     ...mergedSpaceId ? { initialSpaceId: mergedSpaceId } : {},
     ...mergedEnvironmentId ? { initialEnvironmentId: mergedEnvironmentId } : {},
     ...mergedHost ? { initialHost: mergedHost } : {},
@@ -36550,7 +35709,7 @@ function resolvePromptFlags(flags) {
 
 // packages/experience-design-system-cli/src/runs/run-picker-mount.ts
 init_store();
-import { readFile as readFile26 } from "node:fs/promises";
+import { readFile as readFile27 } from "node:fs/promises";
 function migrateRecord2(rec) {
   return {
     ...rec,
@@ -36573,7 +35732,7 @@ async function shouldShowRunPicker(input) {
   const path = input.runsJsonPath ?? runsFilePath();
   let raw;
   try {
-    raw = await readFile26(path, "utf8");
+    raw = await readFile27(path, "utf8");
   } catch {
     return { shouldShow: false, runs: [] };
   }
@@ -36678,10 +35837,7 @@ function registerImportCommand(program) {
     "Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md",
     (v, acc) => [...acc, v],
     []
-  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option(
-    "--with-space-context",
-    "Fetch existing Components + DesignTokens from the target space+env and persist them under <out>/.existing-entities.json for future agent-context enrichment. Requires --space-id, --environment-id, and --cma-token."
-  ).option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
+  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
     "--no-auto-filter",
     "Skip the automatic AI pre-filter; jump straight to manual scope-gate (overrides the credentials.json autoFilter preference; no-op when paired with --auto-accept-scope)"
   ).option(
@@ -36949,7 +36105,7 @@ function registerImportCommand(program) {
             livePreview: opts.livePreview !== false,
             noPush: noPushRequested,
             noSave: opts.save === false,
-            ...opts.outDir ? { outDirOverride: resolve25(opts.outDir) } : {},
+            ...opts.outDir ? { outDirOverride: resolve26(opts.outDir) } : {},
             ...opts.onConflict ? { onConflictMode: opts.onConflict } : {},
             selectPromptPath: opts.selectPromptPath ?? creds.selectPromptPath,
             generatePromptPath: opts.generatePromptPath ?? creds.generatePromptPath,
@@ -36990,7 +36146,7 @@ function registerImportCommand(program) {
         return;
       }
       const projectRoot = normalizePath(opts.project);
-      const outDir = opts.out ? resolve25(opts.out) : join25(projectRoot, ".contentful");
+      const outDir = opts.out ? resolve26(opts.out) : join26(projectRoot, ".contentful");
       const headlessCreds = await readExperiencesCredentials();
       const headlessAgent = resolveAgent(opts.agent, headlessCreds.agent);
       const headlessModel = resolveModel(opts.model, headlessCreds.agentModel);
@@ -37028,7 +36184,6 @@ function registerImportCommand(program) {
           dryRun: dryRunForward,
           selectPromptPath: opts.selectPromptPath,
           autoRejectCycles: opts.autoRejectCycles ?? false,
-          withSpaceContext: opts.withSpaceContext ?? false,
           allowDeletions: opts.allowDeletions ?? false,
           compositionMode: headlessCompositionMode,
           ...opts.compositionMap ? { compositionMap: opts.compositionMap } : {},
@@ -37050,18 +36205,54 @@ function registerImportCommand(program) {
   );
 }
 
-// packages/experience-design-system-cli/src/doctor/command.ts
-init_cli_path();
-
-// packages/experience-design-system-cli/src/doctor/checks.ts
+// packages/experience-design-system-cli/src/setup/command.ts
 init_credentials_store();
-init_agent_definitions();
-init_shell();
-init_checks();
-import { homedir as homedir10 } from "node:os";
-import { join as join28 } from "node:path";
+import { execFile as execFile5, spawn as spawn5 } from "node:child_process";
+import { appendFile as appendFile2, readFile as readFile28, access as access10 } from "node:fs/promises";
+import { join as join27 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { createInterface } from "node:readline";
+import { promisify as promisify2 } from "node:util";
+
+// packages/experience-design-system-cli/src/setup/auto-filter-prompt.ts
+async function promptAutoFilterPreference(ask, current) {
+  const defaultValue = current ?? true;
+  const hint = defaultValue ? "[Y/n]" : "[y/N]";
+  const answer = (await ask(`  Enable AI auto-filter by default? ${hint} `)).trim().toLowerCase();
+  if (answer === "") return defaultValue;
+  if (answer.startsWith("y")) return true;
+  if (answer.startsWith("n")) return false;
+  return defaultValue;
+}
+
+// packages/experience-design-system-cli/src/setup/debug-mode-prompt.ts
+async function promptDebugModePreference(ask, current) {
+  const defaultValue = current ?? false;
+  const hint = defaultValue ? "[Y/n]" : "[y/N]";
+  const answer = (await ask(`  Enable debug logging by default? ${hint} `)).trim().toLowerCase();
+  if (answer === "") return defaultValue;
+  if (answer.startsWith("y")) return true;
+  if (answer.startsWith("n")) return false;
+  return defaultValue;
+}
 
-// packages/experience-design-system-cli/src/doctor/report.ts
+// packages/experience-design-system-cli/src/setup/analytics-prompt.ts
+async function promptAnalyticsPreference(ask, current) {
+  const defaultValue = current ?? false;
+  const hint = defaultValue ? "[Y/n]" : "[y/N]";
+  const answer = (await ask(`  Disable anonymous usage analytics? ${hint} `)).trim().toLowerCase();
+  if (answer === "") return defaultValue;
+  if (answer.startsWith("y")) return true;
+  if (answer.startsWith("n")) return false;
+  return defaultValue;
+}
+
+// packages/experience-design-system-cli/src/setup/command.ts
+init_host_utils();
+init_cli_path();
+var execFileAsync2 = promisify2(execFile5);
+var REQUIRED_NODE_MAJOR = 24;
 function ok(msg) {
   process.stdout.write(`  \x1B[32m\u2713\x1B[0m  ${msg}
 `);
@@ -37078,56 +36269,618 @@ function info(msg) {
   process.stdout.write(`     ${msg}
 `);
 }
-function section(title) {
+function section(title, tag) {
+  const tagStr = tag ? tag === "[required]" ? `  \x1B[31m[required]\x1B[0m` : `  \x1B[2m[optional]\x1B[0m` : "";
   process.stdout.write(`
-\x1B[1m${title}\x1B[0m
+\x1B[1m${title}\x1B[0m${tagStr}
+`);
+}
+function dim(msg) {
+  process.stdout.write(`\x1B[2m${msg}\x1B[0m
 `);
 }
-function infoStderr(stderr, limit) {
-  for (const line of stderr.trim().split("\n").slice(0, limit)) info(line);
+function isInteractivePromptSession() {
+  return !!(process.stdin.isTTY && process.stdout.isTTY);
 }
-
-// packages/experience-design-system-cli/src/doctor/checks.ts
-async function reportNode() {
-  section("Checking Node.js version");
-  const check = checkNodeVersion();
-  if (check.passed) {
-    ok(`Node.js v${check.version}`);
+function prompt(question) {
+  if (!isInteractivePromptSession()) {
+    return Promise.resolve("");
+  }
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve28) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve28(answer.trim());
+    });
+  });
+}
+function promptSecret(question) {
+  if (!isInteractivePromptSession()) {
+    return Promise.resolve("");
+  }
+  return new Promise((resolve28) => {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout,
+      terminal: process.stdin.isTTY
+    });
+    let value = "";
+    process.stdout.write(question);
+    let origWrite = null;
+    if (process.stdin.isTTY) {
+      origWrite = rl.output.write.bind(
+        rl.output
+      );
+      rl.output.write = (s) => {
+        if (s === "\r\n" || s === "\n" || s === "\r") origWrite(s);
+      };
+    }
+    rl.on("line", (line) => {
+      value = line;
+      rl.close();
+    });
+    rl.once("close", () => {
+      if (origWrite) {
+        rl.output.write = origWrite;
+      }
+      if (!process.stdin.isTTY) process.stdout.write("\n");
+      process.stdin.resume();
+      resolve28(value);
+    });
+  });
+}
+async function confirm(question, defaultYes = true) {
+  if (!isInteractivePromptSession()) {
+    return false;
+  }
+  const hint = defaultYes ? "[Y/n]" : "[y/N]";
+  const answer = await prompt(`  ${question} ${hint} `);
+  if (!answer) return defaultYes;
+  return answer.toLowerCase().startsWith("y");
+}
+async function binaryExists(name) {
+  try {
+    await execFileAsync2("which", [name]);
     return true;
+  } catch {
+    return false;
+  }
+}
+function runSpawn(cmd, args, opts = {}) {
+  return new Promise((resolve28) => {
+    const child = spawn5(cmd, args, {
+      cwd: opts.cwd,
+      env: opts.env ?? process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let settled = false;
+    let stdout = "";
+    let stderr = "";
+    child.on("error", (err) => {
+      if (!settled) {
+        settled = true;
+        resolve28({ exitCode: 1, stdout: "", stderr: err.message });
+      }
+    });
+    child.stdout.on("data", (d) => {
+      stdout += String(d);
+    });
+    child.stderr.on("data", (d) => {
+      stderr += String(d);
+    });
+    child.on("exit", (code) => {
+      if (!settled) {
+        settled = true;
+        resolve28({ exitCode: code ?? 1, stdout, stderr });
+      }
+    });
+  });
+}
+async function detectShellProfile() {
+  const shell = process.env["SHELL"] ?? "";
+  const home = homedir9();
+  if (shell.includes("zsh")) {
+    return join27(home, ".zshrc");
+  }
+  if (shell.includes("bash")) {
+    const bashProfile = join27(home, ".bash_profile");
+    const exists = await access10(bashProfile).then(() => true).catch(() => false);
+    return exists ? bashProfile : join27(home, ".bashrc");
   }
-  fail(`Node.js v${check.version} \u2014 need v${check.required}+`);
+  if (shell.includes("fish")) {
+    return join27(home, ".config", "fish", "config.fish");
+  }
+  return join27(home, ".profile");
+}
+async function profileContains(profilePath, str) {
+  try {
+    const content = await readFile28(profilePath, "utf8");
+    return content.includes(str);
+  } catch {
+    return false;
+  }
+}
+async function appendToProfile(profilePath, lines) {
+  await appendFile2(profilePath, `
+${lines}
+`, "utf8");
+}
+async function setupNode() {
+  section("Step 1: Node.js", "[required]");
+  const current = process.versions.node;
+  const major = parseInt(current.split(".")[0], 10);
+  if (major >= REQUIRED_NODE_MAJOR) {
+    ok(`Node.js v${current} \u2014 already good`);
+    return true;
+  }
+  fail(`Node.js v${current} \u2014 need v${REQUIRED_NODE_MAJOR}+`);
   info("");
-  info("How to fix:");
-  const managers = await detectNodeVersionManagers(homedir10());
-  if (managers.nvm) {
-    info(`  nvm install ${check.required}`);
-    info(`  nvm use ${check.required}`);
-    info(`  nvm alias default ${check.required}   # make it permanent`);
-  } else if (managers.fnm) {
-    info(`  fnm install ${check.required}`);
-    info(`  fnm use ${check.required}`);
-  } else {
-    info(`  Download Node v${check.required} from https://nodejs.org`);
+  const hasNvm = await binaryExists("nvm") || await access10(join27(homedir9(), ".nvm", "nvm.sh")).then(() => true).catch(() => false);
+  const hasFnm = await binaryExists("fnm");
+  if (hasNvm) {
+    info(`nvm detected. Will run: nvm install ${REQUIRED_NODE_MAJOR} && nvm use ${REQUIRED_NODE_MAJOR}`);
+    const go = await confirm(`Install and switch to Node ${REQUIRED_NODE_MAJOR} via nvm?`);
+    if (!go) {
+      warn(`Skipped. Re-run experiences setup after switching to Node ${REQUIRED_NODE_MAJOR}.`);
+      return false;
+    }
+    const nvmScript = join27(homedir9(), ".nvm", "nvm.sh");
+    const result = await runSpawn("bash", [
+      "-c",
+      `source "${nvmScript}" && nvm install ${REQUIRED_NODE_MAJOR} && nvm alias default ${REQUIRED_NODE_MAJOR}`
+    ]);
+    if (result.exitCode !== 0) {
+      fail("nvm install failed");
+      info(result.stderr.trim().split("\n").slice(0, 5).join("\n"));
+      info(`Run manually: nvm install ${REQUIRED_NODE_MAJOR} && nvm use ${REQUIRED_NODE_MAJOR}`);
+      return false;
+    }
+    ok(`Node ${REQUIRED_NODE_MAJOR} installed via nvm. Re-run experiences setup in a fresh shell to pick it up.`);
+    return false;
+  }
+  if (hasFnm) {
+    info(`fnm detected. Will run: fnm install ${REQUIRED_NODE_MAJOR} && fnm use ${REQUIRED_NODE_MAJOR}`);
+    const go = await confirm(`Install and switch to Node ${REQUIRED_NODE_MAJOR} via fnm?`);
+    if (!go) {
+      warn(`Skipped. Re-run experiences setup after switching to Node ${REQUIRED_NODE_MAJOR}.`);
+      return false;
+    }
+    const result = await runSpawn("fnm", ["install", String(REQUIRED_NODE_MAJOR)]);
+    if (result.exitCode !== 0) {
+      fail("fnm install failed");
+      info(`Run manually: fnm install ${REQUIRED_NODE_MAJOR} && fnm use ${REQUIRED_NODE_MAJOR}`);
+      return false;
+    }
+    const useResult = await runSpawn("fnm", ["use", String(REQUIRED_NODE_MAJOR)]);
+    if (useResult.exitCode !== 0) {
+      warn(`fnm use ${REQUIRED_NODE_MAJOR} failed \u2014 node installed but not activated`);
+      info(`Run manually: fnm use ${REQUIRED_NODE_MAJOR} && fnm default ${REQUIRED_NODE_MAJOR}`);
+    } else {
+      const defaultResult = await runSpawn("fnm", ["default", String(REQUIRED_NODE_MAJOR)]);
+      if (defaultResult.exitCode !== 0) {
+        warn(`fnm default ${REQUIRED_NODE_MAJOR} failed \u2014 version won't persist across new shells`);
+        info(`Run manually: fnm default ${REQUIRED_NODE_MAJOR}`);
+      }
+    }
+    ok(`Node ${REQUIRED_NODE_MAJOR} installed via fnm. Re-run experiences setup in a fresh shell.`);
+    return false;
+  }
+  info("No Node version manager detected (nvm or fnm).");
+  const installNvm = await confirm("Install nvm now? (recommended)");
+  if (installNvm) {
+    info("Running nvm install script...");
+    const result = await runSpawn("bash", [
+      "-c",
+      "curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash"
+    ]);
+    if (result.exitCode !== 0) {
+      fail("nvm install failed");
+      info("Install manually: https://github.com/nvm-sh/nvm#installing-and-updating");
+      return false;
+    }
+    ok("nvm installed. Open a new shell, then re-run experiences setup.");
+    return false;
   }
+  info(`Install Node ${REQUIRED_NODE_MAJOR} manually from https://nodejs.org`);
   return false;
 }
-async function reportPnpm(pkgRoot) {
+async function setupPnpm() {
+  section("Step 2: pnpm", "[required]");
+  if (await binaryExists("pnpm")) {
+    const v = await runSpawn("pnpm", ["--version"]);
+    ok(`pnpm v${v.stdout.trim()} \u2014 already installed`);
+    return true;
+  }
+  fail("pnpm not found");
+  info("");
+  const hasCorecpack = await binaryExists("corepack");
+  if (hasCorecpack) {
+    info("Will run: corepack enable && corepack prepare pnpm@latest --activate");
+    const go2 = await confirm("Install pnpm via corepack?");
+    if (go2) {
+      const r1 = await runSpawn("corepack", ["enable"]);
+      const r2 = r1.exitCode === 0 ? await runSpawn("corepack", ["prepare", "pnpm@latest", "--activate"]) : r1;
+      if (r2.exitCode !== 0) {
+        fail("corepack install failed");
+        info("Try: npm install -g pnpm");
+        return false;
+      }
+      ok("pnpm installed via corepack");
+      return true;
+    }
+  }
+  info("Will run: npm install -g pnpm");
+  const go = await confirm("Install pnpm via npm?");
+  if (!go) {
+    warn("Skipped. Install pnpm manually: npm install -g pnpm");
+    return false;
+  }
+  const result = await runSpawn("npm", ["install", "-g", "pnpm"]);
+  if (result.exitCode !== 0) {
+    fail("npm install -g pnpm failed");
+    info(result.stderr.trim().split("\n").slice(0, 5).join("\n"));
+    return false;
+  }
+  ok("pnpm installed");
+  return true;
+}
+async function setupBuild(repoRoot) {
+  section("Step 3: Install dependencies & build", "[required]");
+  info("Running pnpm install...");
+  const installResult = await runSpawn("pnpm", ["install", "--frozen-lockfile"], { cwd: repoRoot });
+  if (installResult.exitCode !== 0) {
+    fail("pnpm install failed");
+    const errLines = installResult.stderr.trim().split("\n").slice(0, 8);
+    for (const line of errLines) info(line);
+    info("");
+    info("Try: pnpm install (without --frozen-lockfile) to update the lockfile");
+    return false;
+  }
+  ok("Dependencies installed");
+  info("Building CLI...");
+  const buildResult = await runSpawn("pnpm", ["--filter", "@contentful/experience-design-system-cli", "run", "build"], {
+    cwd: repoRoot
+  });
+  if (buildResult.exitCode !== 0) {
+    fail("Build failed");
+    const errLines = buildResult.stderr.trim().split("\n").slice(0, 10);
+    for (const line of errLines) info(line);
+    return false;
+  }
+  ok("CLI built successfully");
+  return true;
+}
+var AGENT_DEFS = [
+  { name: "Claude Code", binary: "claude", installHint: "npm install -g @anthropic-ai/claude-code && claude login" },
+  { name: "OpenAI Codex", binary: "codex", installHint: "npm install -g @openai/codex  (requires OPENAI_API_KEY)" },
+  { name: "OpenCode", binary: "opencode", installHint: "npm install -g opencode-ai && opencode auth" },
+  { name: "GitHub Copilot", binary: "copilot", installHint: "npm install -g @github/copilot && copilot" }
+];
+function pick(items, defaultIdx = 0) {
+  items.forEach((item, i) => {
+    const num = `\x1B[1m[${i + 1}]\x1B[0m`;
+    const desc = item.description ? `  \x1B[2m${item.description}\x1B[0m` : "";
+    const def = i === defaultIdx ? `  \x1B[2m(default)\x1B[0m` : "";
+    process.stdout.write(`     ${num} ${item.label}${desc}${def}
+`);
+  });
+  process.stdout.write(`     \x1B[2m[s] Skip\x1B[0m
+`);
+}
+async function promptCodexModel(ask = prompt) {
+  if (process.env["OPENAI_API_KEY"]) return void 0;
+  info("");
+  process.stdout.write(`     \x1B[33m\u26A0\x1B[0m  No OPENAI_API_KEY \u2014 using ChatGPT account authentication.
+`);
+  info("  Tip: run \x1B[1mcodex\x1B[0m then type \x1B[1m/model\x1B[0m to browse the models available to your account.");
+  const model = await ask("  Model name (optional - press Enter for Codex default): ");
+  const trimmed = model.trim();
+  return trimmed || void 0;
+}
+async function setupAgent() {
+  section("Step 4: Coding agent (claude, codex, opencode, or copilot)", "[required]");
+  info("experiences import uses a coding agent to generate component definitions.");
+  info("");
+  const found = (await Promise.all(AGENT_DEFS.map(async (a) => await binaryExists(a.binary) ? a : null))).filter(
+    (a) => a !== null
+  );
+  if (found.length === 1) {
+    ok(`${found[0].name} (${found[0].binary}) found`);
+    const agentModel = found[0].binary === "codex" ? await promptCodexModel() : void 0;
+    return { agent: found[0].binary, agentModel };
+  }
+  if (found.length > 1) {
+    info("Multiple coding agents found. Choose one to use as the default:");
+    info("");
+    pick(found.map((a) => ({ label: `${a.name}`, description: a.binary })));
+    info("");
+    const choice2 = await prompt("  \x1B[2m\u203A\x1B[0m Your choice [1]: ");
+    if (choice2.toLowerCase() === "s") {
+      warn("Skipped. Install a coding agent before running experiences import.");
+      return { agent: void 0, agentModel: void 0 };
+    }
+    const parsed = choice2 === "" ? 1 : parseInt(choice2, 10);
+    const idx = Number.isNaN(parsed) || parsed < 1 || parsed > found.length ? 0 : parsed - 1;
+    const selected = found[idx];
+    const agentModel = selected.binary === "codex" ? await promptCodexModel() : void 0;
+    return { agent: selected.binary, agentModel };
+  }
+  warn("No coding agent found on PATH");
+  info("");
+  info("Choose one to install:");
+  info("");
+  pick([
+    { label: "Claude Code", description: "npm install -g @anthropic-ai/claude-code" },
+    { label: "OpenAI Codex", description: "npm install -g @openai/codex" },
+    { label: "OpenCode", description: "npm install -g opencode-ai" }
+  ]);
+  info("");
+  const choice = await prompt("  Your choice: ");
+  if (choice === "1" || choice === "") {
+    const r = await runSpawn("npm", ["install", "-g", "@anthropic-ai/claude-code"]);
+    if (r.exitCode !== 0) {
+      fail("Install failed");
+      info(r.stderr.trim().split("\n").slice(0, 5).join("\n"));
+      return { agent: void 0, agentModel: void 0 };
+    }
+    if (!await binaryExists("claude")) {
+      fail("claude binary not found on PATH after install \u2014 check your npm global bin directory");
+      return { agent: void 0, agentModel: void 0 };
+    }
+    ok("Claude Code installed");
+    info("");
+    info("Next: run `claude login` to authenticate (browser OAuth).");
+    info("Or set ANTHROPIC_API_KEY in your shell profile.");
+    return { agent: "claude", agentModel: void 0 };
+  }
+  if (choice === "2") {
+    const r = await runSpawn("npm", ["install", "-g", "@openai/codex"]);
+    if (r.exitCode !== 0) {
+      fail("Install failed");
+      return { agent: void 0, agentModel: void 0 };
+    }
+    if (!await binaryExists("codex")) {
+      fail("codex binary not found on PATH after install \u2014 check your npm global bin directory");
+      return { agent: void 0, agentModel: void 0 };
+    }
+    ok("OpenAI Codex installed");
+    const agentModel = await promptCodexModel();
+    return { agent: "codex", agentModel };
+  }
+  if (choice === "3") {
+    const r = await runSpawn("npm", ["install", "-g", "opencode-ai"]);
+    if (r.exitCode !== 0) {
+      fail("Install failed");
+      return { agent: void 0, agentModel: void 0 };
+    }
+    if (!await binaryExists("opencode")) {
+      fail("opencode binary not found on PATH after install \u2014 check your npm global bin directory");
+      return { agent: void 0, agentModel: void 0 };
+    }
+    ok("OpenCode installed");
+    info("Run `opencode auth` to configure your provider.");
+    return { agent: "opencode", agentModel: void 0 };
+  }
+  warn("Skipped. Install a coding agent before running experiences import.");
+  return { agent: void 0, agentModel: void 0 };
+}
+async function setupContentfulCredentials() {
+  section("Step 5: Contentful credentials", "[optional]");
+  info(`Saved to ${experiencesCredentialsPath()} \u2014 loaded automatically by experiences import.`);
+  info("");
+  const envShadowing = [
+    process.env["CONTENTFUL_SPACE_ID"] ? "CONTENTFUL_SPACE_ID" : null,
+    process.env["CONTENTFUL_ENVIRONMENT_ID"] ? "CONTENTFUL_ENVIRONMENT_ID" : null,
+    process.env["CONTENTFUL_MANAGEMENT_TOKEN"] ? "CONTENTFUL_MANAGEMENT_TOKEN" : null,
+    process.env["EDS_HOST"] ? "EDS_HOST" : null
+  ].filter((v) => !!v);
+  if (envShadowing.length > 0) {
+    warn(
+      `Env vars set: ${envShadowing.join(", ")}. Values saved here take precedence; env vars only apply where disk is empty.`
+    );
+    info("");
+  }
+  const stored = await readExperiencesCredentials();
+  const currentSpace = stored.spaceId;
+  const currentEnv = stored.environmentId;
+  const currentToken = stored.cmaToken;
+  const storedHost = stored.host;
+  const currentHost = storedHost ?? DEFAULT_CONFIGURED_HOST;
+  const hasAny = !!(currentSpace || currentEnv || currentToken);
+  if (hasAny) {
+    info("Current values:");
+    if (currentSpace) {
+      ok(`Space ID        ${currentSpace}`);
+    } else {
+      warn("Space ID        (not set)");
+    }
+    if (currentEnv) {
+      ok(`Environment ID  ${currentEnv}`);
+    } else {
+      warn("Environment ID  (not set)");
+    }
+    if (currentToken) {
+      ok(`CMA Token       ${"\u2022".repeat(Math.min(currentToken.length, 8))}...`);
+    } else {
+      warn("CMA Token       (not set)");
+    }
+    ok(`API Host        ${currentHost}`);
+    info("");
+  }
+  const allSet = !!(currentSpace && currentEnv && currentToken);
+  const doUpdate = await confirm(hasAny ? "Update credentials?" : "Configure Contentful credentials?", !allSet);
+  if (!doUpdate) {
+    if (allSet) {
+      ok("Credentials already configured \u2014 no changes made");
+    } else {
+      warn("Skipped. experiences import will prompt for credentials interactively.");
+    }
+    return true;
+  }
+  info("");
+  info("Get your CMA token: Contentful web app \u2192 Settings \u2192 API keys \u2192 Content management tokens");
+  info("");
+  const spaceIdInput = await prompt(`  Space ID${currentSpace ? ` [${currentSpace}]` : ""}: `);
+  const spaceId = spaceIdInput || currentSpace;
+  const envIdInput = await prompt(`  Environment ID [${currentEnv || "master"}]: `);
+  const environmentId = envIdInput || currentEnv || "master";
+  const tokenInput = await promptSecret(
+    `  CMA token${currentToken ? " [press Enter to keep existing]" : " (paste here)"}: `
+  );
+  const cmaToken = tokenInput || currentToken;
+  if (!cmaToken || !spaceId) {
+    warn("Space ID and CMA token are required. Skipped.");
+    return false;
+  }
+  const hostInput = await prompt(`  API host [${currentHost}]: `);
+  const host = toConfiguredHost(hostInput) ?? storedHost;
+  const existing = await readExperiencesCredentials();
+  await writeExperiencesCredentials({ ...existing, spaceId, environmentId, cmaToken, ...host ? { host } : {} });
+  ok(`Credentials saved to ${experiencesCredentialsPath()}`);
+  ok(`API host set to ${host ?? DEFAULT_CONFIGURED_HOST}`);
+  info("Run experiences import \u2014 credentials will be pre-filled automatically.");
+  return true;
+}
+async function promptCustomSkillPath(kind, current, ask = prompt) {
+  const flagName = kind === "select" ? "--select-prompt-path" : "--generate-prompt-path";
+  void flagName;
+  const label = kind === "select" ? "select (analyze select-agent)" : "generate (generate components)";
+  const currentLabel = current ? ` [${current}]` : " [none]";
+  const answer = await ask(`  Custom ${label} prompt path${currentLabel} (empty=keep, "-"=clear): `);
+  const trimmed = answer.trim();
+  if (trimmed === "") return void 0;
+  if (trimmed === "-") return null;
+  return trimmed;
+}
+async function setupQoL(profilePath) {
+  section("Step 6: Optional extras", "[optional]");
+  info("These are not required for experiences import but improve the experience.");
+  info("");
+  const existingCreds = await readExperiencesCredentials();
+  info("AI auto-filter \u2014 runs an agent pass before the manual scope-gate to prefilter components.");
+  info("Operators who prefer to review every component can default this OFF and override per run with --auto-filter.");
+  const autoFilter = await promptAutoFilterPreference((q) => prompt(q), existingCreds.autoFilter);
+  if (autoFilter !== (existingCreds.autoFilter ?? true)) {
+    await writeExperiencesCredentials({ ...existingCreds, autoFilter });
+    ok(`AI auto-filter default set to ${autoFilter ? "ON" : "OFF"}`);
+  } else {
+    dim("     unchanged");
+  }
+  info("");
+  const hasConcurrency = await profileContains(profilePath, "EDS_EXTRACT_CONCURRENCY");
+  if (!hasConcurrency) {
+    info("EDS_EXTRACT_CONCURRENCY \u2014 controls how many components are analyzed in parallel.");
+    info("Default is 4. Set higher (e.g. 8) on fast machines to speed up large codebases.");
+    const setConcurrency = await confirm("Add EDS_EXTRACT_CONCURRENCY=8 to your profile?", false);
+    if (setConcurrency) {
+      await appendToProfile(profilePath, "# experiences performance\nexport EDS_EXTRACT_CONCURRENCY=8");
+      ok(`EDS_EXTRACT_CONCURRENCY=8 written to ${profilePath}`);
+    } else {
+      dim("     skipped");
+    }
+  } else {
+    ok("EDS_EXTRACT_CONCURRENCY \u2014 already set");
+  }
+  info("");
+  info("Custom skill prompt paths \u2014 point select-agent and/or generate components at your own .md prompts.");
+  info("When set, the bundled invariants (utility-wrapper rejection, description rules) do NOT apply.");
+  const offerCustomPrompts = await confirm("Configure custom skill prompt paths?", false);
+  if (offerCustomPrompts) {
+    const stored = await readExperiencesCredentials();
+    const selectAnswer = await promptCustomSkillPath("select", stored.selectPromptPath);
+    const generateAnswer = await promptCustomSkillPath("generate", stored.generatePromptPath);
+    const updated = { ...stored };
+    if (selectAnswer === null) delete updated.selectPromptPath;
+    else if (selectAnswer !== void 0) updated.selectPromptPath = selectAnswer;
+    if (generateAnswer === null) delete updated.generatePromptPath;
+    else if (generateAnswer !== void 0) updated.generatePromptPath = generateAnswer;
+    await writeExperiencesCredentials(updated);
+    ok(`Custom prompt paths saved to ${experiencesCredentialsPath()}`);
+  } else {
+    dim("     skipped");
+  }
+  info("");
+  info("Debug logging \u2014 writes a JSONL trace of every command decision (agent calls, tool calls,");
+  info("apply actions, filter decisions, etc.) to ~/.contentful/experience-design-system-cli/debug/.");
+  info("Useful for developers debugging the CLI; OFF by default because traces are verbose.");
+  const debugCreds = await readExperiencesCredentials();
+  const debugChoice = await promptDebugModePreference((q) => prompt(q), debugCreds.debug);
+  if (debugChoice !== (debugCreds.debug ?? false)) {
+    await writeExperiencesCredentials({ ...debugCreds, debug: debugChoice });
+    ok(`Debug logging default set to ${debugChoice ? "ON" : "OFF"}`);
+  } else {
+    dim("     unchanged");
+  }
+  info("");
+  info("");
+  info("Anonymous usage analytics \u2014 helps us see which commands are used and where imports");
+  info("succeed or fail. Never includes source code, file paths, credentials, or authored content.");
+  info("Disabling here persists the opt-out; it will not silently re-enable later. See README > Usage data.");
+  const analyticsCreds = await readExperiencesCredentials();
+  const analyticsDisabled = await promptAnalyticsPreference((q) => prompt(q), analyticsCreds.analyticsDisabled);
+  if (analyticsDisabled !== (analyticsCreds.analyticsDisabled ?? false)) {
+    await writeExperiencesCredentials({ ...analyticsCreds, analyticsDisabled });
+    ok(`Analytics ${analyticsDisabled ? "disabled" : "enabled"}`);
+  } else {
+    dim("     unchanged");
+  }
+  info("");
+  info("");
+  info("NO_COLOR \u2014 set to 1 to disable ANSI color output (useful in CI or plain terminals).");
+  const setNoColor = await confirm("Add NO_COLOR=1 (disable colors) to your profile?", false);
+  if (setNoColor) {
+    const hasNoColor = await profileContains(profilePath, "NO_COLOR");
+    if (!hasNoColor) {
+      await appendToProfile(profilePath, "export NO_COLOR=1");
+      ok(`NO_COLOR=1 written to ${profilePath}`);
+    } else {
+      warn("NO_COLOR already present in profile \u2014 skipping");
+    }
+  } else {
+    dim("     skipped");
+  }
+}
+async function checkNode() {
+  section("Checking Node.js version");
+  const current = process.versions.node;
+  const major = parseInt(current.split(".")[0], 10);
+  if (major < REQUIRED_NODE_MAJOR) {
+    fail(`Node.js v${current} \u2014 need v${REQUIRED_NODE_MAJOR}+`);
+    info("");
+    info("How to fix:");
+    if (await binaryExists("nvm")) {
+      info(`  nvm install ${REQUIRED_NODE_MAJOR}`);
+      info(`  nvm use ${REQUIRED_NODE_MAJOR}`);
+      info(`  nvm alias default ${REQUIRED_NODE_MAJOR}   # make it permanent`);
+    } else if (await binaryExists("fnm")) {
+      info(`  fnm install ${REQUIRED_NODE_MAJOR}`);
+      info(`  fnm use ${REQUIRED_NODE_MAJOR}`);
+    } else {
+      info(`  Download Node v${REQUIRED_NODE_MAJOR} from https://nodejs.org`);
+    }
+    return false;
+  }
+  ok(`Node.js v${current}`);
+  return true;
+}
+async function checkPnpm(pkgRoot) {
   section("Checking pnpm");
-  const check = await checkPnpm(pkgRoot);
-  if (check.status === "missing") {
+  if (!await binaryExists("pnpm")) {
     fail("pnpm not found");
     info("How to fix:");
     info("  npm install -g pnpm");
     info("  # or: corepack enable pnpm");
     return false;
   }
-  if (check.status === "broken") {
+  const versionResult = await runSpawn("pnpm", ["--version"]);
+  if (versionResult.exitCode !== 0) {
     fail("pnpm found but not working");
     info("Try reinstalling: npm install -g pnpm --force");
     return false;
   }
-  ok(`pnpm v${check.version}`);
-  if (check.status === "unusable-in-repo") {
+  ok(`pnpm v${versionResult.stdout.trim()}`);
+  const pingResult = await runSpawn("pnpm", ["exec", "node", "--version"], { cwd: pkgRoot });
+  if (pingResult.exitCode !== 0) {
     fail("pnpm cannot execute in repo root");
     info("The pnpm global store may be mismatched with your current Node version.");
     info("How to fix:");
@@ -37136,18 +36889,21 @@ async function reportPnpm(pkgRoot) {
   }
   return true;
 }
-async function reportDependencies(pkgRoot) {
+async function checkDependencies(pkgRoot) {
   section("Checking dependencies (pnpm install)");
-  if (!await pathExists5(join28(pkgRoot, "node_modules"))) {
+  const nodeModulesExists = await access10(join27(pkgRoot, "node_modules")).then(() => true).catch(() => false);
+  if (!nodeModulesExists) {
     info("node_modules not found \u2014 running pnpm install...");
   } else {
     info("Running pnpm install to ensure dependencies are up to date...");
   }
-  const check = await installDependencies(pkgRoot);
-  if (!check.passed) {
+  const repoRoot = join27(pkgRoot, "..", "..");
+  const result = await runSpawn("pnpm", ["install", "--frozen-lockfile"], { cwd: repoRoot });
+  if (result.exitCode !== 0) {
     fail("pnpm install failed");
     info("");
-    infoStderr(check.result.stderr, 10);
+    const errLines = result.stderr.trim().split("\n").slice(0, 10);
+    for (const line of errLines) info(line);
     info("");
     info("How to fix:");
     info("  \u2022 Try: pnpm install (without --frozen-lockfile) to update the lockfile");
@@ -37157,14 +36913,18 @@ async function reportDependencies(pkgRoot) {
   ok("Dependencies installed");
   return true;
 }
-async function reportBuild(pkgRoot) {
+async function checkBuild(pkgRoot) {
   section("Building CLI");
   info("Running pnpm build...");
-  const check = await buildCli(join28(pkgRoot, "..", ".."));
-  if (!check.passed) {
+  const repoRoot = join27(pkgRoot, "..", "..");
+  const result = await runSpawn("pnpm", ["--filter", "@contentful/experience-design-system-cli", "run", "build"], {
+    cwd: repoRoot
+  });
+  if (result.exitCode !== 0) {
     fail("Build failed");
     info("");
-    infoStderr(check.result.stderr, 15);
+    const errLines = result.stderr.trim().split("\n").slice(0, 15);
+    for (const line of errLines) info(line);
     info("");
     info("How to fix:");
     info("  \u2022 Check for TypeScript errors: pnpm typecheck");
@@ -37174,22 +36934,25 @@ async function reportBuild(pkgRoot) {
   ok("Build succeeded");
   return true;
 }
-async function reportAgent() {
+async function checkAgent() {
   section("Checking coding agent");
+  const agents = AGENT_DEFS;
   const creds = await readExperiencesCredentials();
   const savedAgent = creds.agent;
   const savedModel = creds.agentModel;
   if (savedAgent) {
-    if (await binaryExists(savedAgent)) {
+    const found = await binaryExists(savedAgent);
+    if (found) {
       const modelStr = savedModel ? ` \u2014 model: ${savedModel}` : "";
       ok(`${savedAgent}${modelStr} (saved preference)`);
       return true;
+    } else {
+      warn(`Saved agent '${savedAgent}' not found on PATH`);
+      info(`Re-run experiences setup to reconfigure.`);
+      return false;
     }
-    warn(`Saved agent '${savedAgent}' not found on PATH`);
-    info(`Re-run experiences setup to reconfigure.`);
-    return false;
   }
-  for (const agent of AGENT_DEFS) {
+  for (const agent of agents) {
     if (await binaryExists(agent.binary)) {
       ok(`${agent.name} (${agent.binary}) found`);
       info("Tip: run experiences setup to save a default agent and model.");
@@ -37204,147 +36967,152 @@ async function reportAgent() {
   info("  \u2022 OpenCode:      npm install -g opencode-ai");
   return false;
 }
-
-// packages/experience-design-system-cli/src/doctor/command.ts
-async function runDoctor(opts) {
-  process.stderr.write("\x1B[1mexperiences doctor\x1B[0m \u2014 checking your environment\n");
-  const pkgRoot = findPkgRoot();
-  const results = [];
-  const nodeOk = await reportNode();
-  results.push({ name: "Node.js version", ok: nodeOk, required: true });
-  if (nodeOk) {
-    const pnpmOk = await reportPnpm(pkgRoot);
-    results.push({ name: "pnpm", ok: pnpmOk, required: true });
-    if (!opts.skipBuild) {
-      if (pnpmOk) {
-        const depsOk = await reportDependencies(pkgRoot);
-        results.push({ name: "dependencies", ok: depsOk, required: true });
-        if (depsOk) {
-          const buildOk = await reportBuild(pkgRoot);
-          results.push({ name: "build", ok: buildOk, required: true });
+function registerSetupCommand(program) {
+  program.command("doctor").description("Check prerequisites so experiences import runs without errors").option("--skip-build", "Skip the pnpm install + build step (useful if already built)").option("--skip-agent", "Skip the coding agent check").action(async (opts) => {
+    process.stderr.write("\x1B[1mexperiences doctor\x1B[0m \u2014 checking your environment\n");
+    const pkgRoot = findPkgRoot();
+    const results = [];
+    const nodeOk = await checkNode();
+    results.push({ name: "Node.js version", ok: nodeOk, required: true });
+    if (nodeOk) {
+      const pnpmOk = await checkPnpm(pkgRoot);
+      results.push({ name: "pnpm", ok: pnpmOk, required: true });
+      if (!opts.skipBuild) {
+        if (pnpmOk) {
+          const depsOk = await checkDependencies(pkgRoot);
+          results.push({ name: "dependencies", ok: depsOk, required: true });
+          if (depsOk) {
+            const buildOk = await checkBuild(pkgRoot);
+            results.push({ name: "build", ok: buildOk, required: true });
+          }
         }
+      } else {
+        info("\nSkipping install + build (--skip-build)");
       }
+    }
+    if (!opts.skipAgent) {
+      const agentOk = await checkAgent();
+      results.push({ name: "coding agent", ok: agentOk, required: false });
+    }
+    section("Summary");
+    const failed = results.filter((r) => !r.ok);
+    const requiredFailed = failed.filter((r) => r.required);
+    for (const r of results) {
+      if (r.ok) {
+        ok(r.name);
+      } else if (r.required) {
+        fail(`${r.name} \u2014 required`);
+      } else {
+        warn(`${r.name} \u2014 optional`);
+      }
+    }
+    if (requiredFailed.length === 0 && failed.length === 0) {
+      process.stderr.write(
+        "\n\x1B[32m\x1B[1m\u2713 All checks passed. You are ready to run: experiences import\x1B[0m\n\n"
+      );
+      process.exit(0);
+    } else if (requiredFailed.length === 0) {
+      process.stderr.write("\n\x1B[33m\x1B[1m\u26A0 Required checks passed, but optional checks failed.\x1B[0m\n");
+      process.stderr.write(
+        "  You can run \x1B[1mexperiences import\x1B[0m but the generate steps may fail without a coding agent.\n\n"
+      );
+      process.exit(0);
     } else {
-      info("\nSkipping install + build (--skip-build)");
-    }
-  }
-  if (!opts.skipAgent) {
-    const agentOk = await reportAgent();
-    results.push({ name: "coding agent", ok: agentOk, required: false });
-  }
-  section("Summary");
-  const failed = results.filter((r) => !r.ok);
-  const requiredFailed = failed.filter((r) => r.required);
-  for (const r of results) {
-    if (r.ok) ok(r.name);
-    else if (r.required) fail(`${r.name} \u2014 required`);
-    else warn(`${r.name} \u2014 optional`);
-  }
-  if (requiredFailed.length === 0 && failed.length === 0) {
-    process.stderr.write("\n\x1B[32m\x1B[1m\u2713 All checks passed. You are ready to run: experiences import\x1B[0m\n\n");
-    process.exit(0);
-  } else if (requiredFailed.length === 0) {
-    process.stderr.write("\n\x1B[33m\x1B[1m\u26A0 Required checks passed, but optional checks failed.\x1B[0m\n");
-    process.stderr.write(
-      "  You can run \x1B[1mexperiences import\x1B[0m but the generate steps may fail without a coding agent.\n\n"
-    );
-    process.exit(0);
-  } else {
-    process.stderr.write(
-      `
+      process.stderr.write(
+        `
 \x1B[31m\x1B[1m\u2717 ${requiredFailed.length} required check${requiredFailed.length === 1 ? "" : "s"} failed.\x1B[0m
 `
-    );
-    process.stderr.write("  Fix the issues above, then re-run \x1B[1mexperiences doctor\x1B[0m.\n\n");
-    process.exit(1);
-  }
-}
-function registerDoctorCommand(program) {
-  program.command("doctor").description("Check prerequisites so experiences import runs without errors").option("--skip-build", "Skip the pnpm install + build step (useful if already built)").option("--skip-agent", "Skip the coding agent check").action((opts) => runDoctor(opts));
-}
-
-// packages/experience-design-system-cli/src/setup/command.ts
-init_credentials_store();
-init_cli_path();
-init_terminal_capabilities();
-init_shell();
-import { readFileSync as readFileSync10 } from "node:fs";
-import { join as join29 } from "node:path";
-import { homedir as homedir11 } from "node:os";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
-var SETUP_REQUIRES_TTY_MESSAGE = "Error: experiences setup requires an interactive terminal.";
-function getCliVersion() {
-  const pkg4 = JSON.parse(readFileSync10(join29(findPkgRoot(), "package.json"), "utf8"));
-  return pkg4.version;
-}
-function createSetupScreenDependencies() {
-  return {
-    nodeVersion: process.versions.node,
-    homeDir: homedir11(),
-    env: process.env,
-    binaryExists,
-    run: runSpawn,
-    pathExists: pathExists5,
-    profileContains,
-    appendToProfile,
-    readCredentials: readExperiencesCredentials,
-    writeCredentials: writeExperiencesCredentials,
-    credentialsPath: experiencesCredentialsPath
-  };
-}
-async function runSetup(opts) {
-  if (!getInteractiveTerminalSupport().supported) {
-    process.stderr.write(`${SETUP_REQUIRES_TTY_MESSAGE}
-`);
-    process.exit(1);
-    return;
-  }
-  const { render: render7 } = await import("ink");
-  const { createElement: createElement7 } = await import("react");
-  const { SetupScreen: SetupScreen2 } = await Promise.resolve().then(() => (init_SetupScreen(), SetupScreen_exports));
-  const repoRoot = join29(findPkgRoot(), "..", "..");
-  const profilePath = await detectShellProfile();
-  const completion = { outcome: null };
-  let unmountInk = null;
-  const { waitUntilExit, unmount } = render7(
-    createElement7(SetupScreen2, {
-      version: getCliVersion(),
-      repoRoot,
-      profilePath,
-      dependencies: createSetupScreenDependencies(),
-      skip: {
-        ...opts.skipBuild !== void 0 ? { skipBuild: opts.skipBuild } : {},
-        ...opts.skipAgent !== void 0 ? { skipAgent: opts.skipAgent } : {},
-        ...opts.skipCredentials !== void 0 ? { skipCredentials: opts.skipCredentials } : {},
-        ...opts.skipOptional !== void 0 ? { skipOptional: opts.skipOptional } : {}
-      },
-      offerDoctor: true,
-      onComplete: (result) => {
-        completion.outcome = result;
-        unmountInk?.();
+      );
+      process.stderr.write("  Fix the issues above, then re-run \x1B[1mexperiences doctor\x1B[0m.\n\n");
+      process.exit(1);
+    }
+  });
+  program.command("setup").description("Interactive setup wizard: installs prerequisites and configures credentials for experiences import").option("--skip-build", "Skip the pnpm install + build step").option("--skip-agent", "Skip the coding agent check").option("--skip-credentials", "Skip the Contentful credentials step").option("--skip-optional", "Skip optional quality-of-life extras").action(
+    async (opts) => {
+      process.stdout.write("\n\x1B[1mexperiences setup\x1B[0m \u2014 interactive setup wizard\n");
+      process.stdout.write("Sets up everything you need to run \x1B[1mexperiences import\x1B[0m.\n");
+      const pkgRoot = findPkgRoot();
+      const repoRoot = join27(pkgRoot, "..", "..");
+      const profilePath = await detectShellProfile();
+      const results = [];
+      const nodeOk = await setupNode();
+      results.push({ name: "Node.js 24+", passed: nodeOk, required: true });
+      if (!nodeOk) {
+        process.stdout.write(
+          "\n\x1B[33mNode.js setup requires a shell restart. Re-run experiences setup afterwards.\x1B[0m\n\n"
+        );
+        process.exit(0);
+      }
+      const pnpmOk = await setupPnpm();
+      results.push({ name: "pnpm", passed: pnpmOk, required: true });
+      if (!opts.skipBuild && pnpmOk) {
+        const buildOk = await setupBuild(repoRoot);
+        results.push({ name: "install & build", passed: buildOk, required: true });
+      } else if (opts.skipBuild) {
+        info("\nSkipping install + build (--skip-build)");
+      }
+      if (!opts.skipAgent) {
+        const { agent, agentModel } = await setupAgent();
+        if (agent) {
+          const stored = await readExperiencesCredentials();
+          const { agentModel: _staleModel, ...storedWithoutModel } = stored;
+          await writeExperiencesCredentials({ ...storedWithoutModel, agent, ...agentModel ? { agentModel } : {} });
+        }
+        results.push({ name: "coding agent", passed: !!agent, required: true });
+      } else {
+        info("\nSkipping agent check (--skip-agent)");
+        results.push({ name: "coding agent", passed: true, required: false });
       }
-    })
+      if (!opts.skipCredentials) {
+        const credsOk = await setupContentfulCredentials();
+        results.push({ name: "Contentful credentials", passed: credsOk, required: false });
+      } else {
+        info("\nSkipping credentials (--skip-credentials)");
+      }
+      if (!opts.skipOptional) {
+        await setupQoL(profilePath);
+      }
+      section("Summary");
+      const requiredFailed = results.filter((r) => r.required && !r.passed);
+      const optionalFailed = results.filter((r) => !r.required && !r.passed);
+      for (const r of results) {
+        if (r.passed) {
+          ok(`${r.name}`);
+        } else if (r.required) {
+          fail(`${r.name} \u2014 required`);
+        } else {
+          warn(`${r.name} \u2014 optional`);
+        }
+      }
+      process.stdout.write("\n");
+      if (requiredFailed.length === 0) {
+        process.stdout.write("\x1B[32m\x1B[1m\u2713 Setup complete. You can now run: experiences import\x1B[0m\n");
+        if (optionalFailed.length > 0) {
+          process.stdout.write("  (Some optional steps were skipped \u2014 that's fine.)\n");
+        }
+      } else {
+        process.stdout.write(
+          `\x1B[33m\x1B[1m\u26A0 ${requiredFailed.length} required step${requiredFailed.length === 1 ? "" : "s"} incomplete.\x1B[0m
+`
+        );
+        process.stdout.write("  Complete the steps above, then re-run \x1B[1mexperiences setup\x1B[0m.\n");
+      }
+      process.stdout.write("\n");
+      const runDoctor = process.stdout.isTTY && await confirm("Run experiences doctor now to verify your environment?", requiredFailed.length === 0);
+      if (runDoctor) {
+        process.stdout.write("\n");
+        const cliBin = process.argv[1] ?? fileURLToPath4(import.meta.url);
+        const doctorResult = await runSpawn(process.execPath, [cliBin, "doctor"], {
+          env: process.env
+        });
+        process.stdout.write(doctorResult.stdout);
+        process.stderr.write(doctorResult.stderr);
+        process.exit(doctorResult.exitCode);
+      }
+      process.stdout.write("\nRun \x1B[1mexperiences doctor\x1B[0m at any time to re-check your environment.\n\n");
+      process.exit(requiredFailed.length === 0 ? 0 : 1);
+    }
   );
-  unmountInk = unmount;
-  await waitUntilExit();
-  const finished = completion.outcome;
-  if (!finished) {
-    process.exit(1);
-    return;
-  }
-  if (finished.runDoctor) {
-    const cliBin = process.argv[1] ?? fileURLToPath4(import.meta.url);
-    const doctorResult = await runSpawn(process.execPath, [cliBin, "doctor"], { env: process.env });
-    process.stdout.write(doctorResult.stdout);
-    process.stderr.write(doctorResult.stderr);
-    process.exit(doctorResult.exitCode);
-    return;
-  }
-  process.stdout.write("\nRun \x1B[1mexperiences doctor\x1B[0m at any time to re-check your environment.\n\n");
-  process.exit(finished.exitCode);
-}
-function registerSetupCommand(program) {
-  program.command("setup").description("Interactive setup wizard: installs prerequisites and configures credentials for experiences import").option("--skip-build", "Skip the pnpm install + build step").option("--skip-agent", "Skip the coding agent check").option("--skip-credentials", "Skip the Contentful credentials step").option("--skip-optional", "Skip optional quality-of-life extras").action((opts) => runSetup(opts));
 }
 
 // packages/experience-design-system-cli/src/runs/ls-command.ts
@@ -37504,7 +37272,7 @@ async function beginCommand(command, opts) {
 init_analytics();
 init_credentials_store();
 init_cli_path();
-var pkg3 = JSON.parse(readFileSync11(join30(findPkgRoot(), "package.json"), "utf8"));
+var pkg3 = JSON.parse(readFileSync10(join28(findPkgRoot(), "package.json"), "utf8"));
 async function runBuild(opts) {
   return new Promise((resolvePromise) => {
     const child = opts.spawnFn();
@@ -37541,7 +37309,7 @@ function registerImportV2Command(program) {
 }
 function registerBuildCommand(program) {
   program.command("build").description("Rebuild from source and re-link exo/experiences binaries to this build").action(async () => {
-    const pkgRoot = resolve26(dirname14(fileURLToPath5(import.meta.url)), "..", "..");
+    const pkgRoot = resolve27(dirname14(fileURLToPath5(import.meta.url)), "..", "..");
     process.stderr.write("\u2699  Building from source...\n");
     const { exitCode } = await runBuild({
       spawnFn: () => spawn6("pnpm", ["build"], { cwd: pkgRoot, stdio: "inherit" }),
@@ -37560,7 +37328,6 @@ function createProgram() {
   registerSessionCommand(program);
   registerImportCommand(program);
   registerImportV2Command(program);
-  registerDoctorCommand(program);
   registerSetupCommand(program);
   registerRunsCommand(program);
   registerBuildCommand(program);